mirror of
https://github.com/terraform-aws-modules/terraform-aws-eks.git
synced 2025-09-09 19:32:58 +08:00
feat: Add support for deletion protection functionality in the cluster (#3475)
* feat: Add support for deletion protection functionality in the cluster * fix: Bump version throughout, correct argument/variable name --------- Co-authored-by: Tiago Vieira <tiago.vieira@sqills.com> Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
This commit is contained in:
@@ -25,13 +25,13 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ module "eks" {
|
|||||||
name = local.name
|
name = local.name
|
||||||
kubernetes_version = local.kubernetes_version
|
kubernetes_version = local.kubernetes_version
|
||||||
endpoint_public_access = true
|
endpoint_public_access = true
|
||||||
|
deletion_protection = true
|
||||||
|
|
||||||
enable_cluster_creator_admin_permissions = true
|
enable_cluster_creator_admin_permissions = true
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0 |
|
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0 |
|
||||||
| <a name="requirement_http"></a> [http](#requirement\_http) | >= 3.4 |
|
| <a name="requirement_http"></a> [http](#requirement\_http) | >= 3.4 |
|
||||||
| <a name="requirement_local"></a> [local](#requirement\_local) | >= 2.5 |
|
| <a name="requirement_local"></a> [local](#requirement\_local) | >= 2.5 |
|
||||||
@@ -36,8 +36,8 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
| <a name="provider_aws.remote"></a> [aws.remote](#provider\_aws.remote) | >= 6.0 |
|
| <a name="provider_aws.remote"></a> [aws.remote](#provider\_aws.remote) | >= 6.9 |
|
||||||
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 3.0 |
|
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 3.0 |
|
||||||
| <a name="provider_http"></a> [http](#provider\_http) | >= 3.4 |
|
| <a name="provider_http"></a> [http](#provider\_http) | >= 3.4 |
|
||||||
| <a name="provider_local"></a> [local](#provider\_local) | >= 2.5 |
|
| <a name="provider_local"></a> [local](#provider\_local) | >= 2.5 |
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
helm = {
|
helm = {
|
||||||
source = "hashicorp/helm"
|
source = "hashicorp/helm"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,16 +94,16 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0.0 |
|
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 6.0 |
|
| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 6.9 |
|
||||||
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 3.0.0 |
|
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 3.0 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
helm = {
|
helm = {
|
||||||
source = "hashicorp/helm"
|
source = "hashicorp/helm"
|
||||||
version = ">= 3.0.0"
|
version = ">= 3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ resource "aws_eks_cluster" "this" {
|
|||||||
role_arn = local.role_arn
|
role_arn = local.role_arn
|
||||||
version = var.kubernetes_version
|
version = var.kubernetes_version
|
||||||
enabled_cluster_log_types = var.enabled_log_types
|
enabled_cluster_log_types = var.enabled_log_types
|
||||||
|
deletion_protection = var.deletion_protection
|
||||||
bootstrap_self_managed_addons = false
|
bootstrap_self_managed_addons = false
|
||||||
force_update_version = var.force_update_version
|
force_update_version = var.force_update_version
|
||||||
|
|
||||||
|
|||||||
@@ -64,13 +64,13 @@ module "eks_managed_node_group" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,13 +29,13 @@ module "fargate_profile" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,13 +75,13 @@ module "eks_hybrid_node_role" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,13 +86,13 @@ module "karpenter" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ module "self_managed_node_group" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 4.0 |
|
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 4.0 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.9 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,12 @@ variable "enabled_log_types" {
|
|||||||
default = ["audit", "api", "authenticator"]
|
default = ["audit", "api", "authenticator"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "deletion_protection" {
|
||||||
|
description = "Whether to enable deletion protection for the cluster. When enabled, the cluster cannot be deleted unless deletion protection is first disabled"
|
||||||
|
type = bool
|
||||||
|
default = null
|
||||||
|
}
|
||||||
|
|
||||||
variable "force_update_version" {
|
variable "force_update_version" {
|
||||||
description = "Force version update by overriding upgrade-blocking readiness checks when updating a cluster"
|
description = "Force version update by overriding upgrade-blocking readiness checks when updating a cluster"
|
||||||
type = bool
|
type = bool
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 6.0"
|
version = ">= 6.9"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
Reference in New Issue
Block a user