diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 71ccc545ba..e6874c6a0c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: git://github.com/antonbabenko/pre-commit-terraform - rev: v1.27.0 + rev: v1.30.0 hooks: - id: terraform_fmt - id: terraform_docs diff --git a/README.md b/README.md index c4b751a3f7..1141c5d1dc 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ provider "kubernetes" { module "my-cluster" { source = "terraform-aws-modules/eks/aws" cluster_name = "my-cluster" - cluster_version = "1.14" + cluster_version = "1.16" subnets = ["subnet-abcde012", "subnet-bcde012a", "subnet-fghi345a"] vpc_id = "vpc-1234556abcdef" @@ -164,7 +164,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | cluster\_log\_retention\_in\_days | Number of days to retain log events. Default retention - 90 days. | `number` | `90` | no | | cluster\_name | Name of the EKS cluster. Also used as a prefix in names of related resources. | `string` | n/a | yes | | cluster\_security\_group\_id | If provided, the EKS cluster will be attached to this security group. If not given, a security group will be created with necessary ingress/egress to work with the workers | `string` | `""` | no | -| cluster\_version | Kubernetes version to use for the EKS cluster. | `string` | `"1.15"` | no | +| cluster\_version | Kubernetes version to use for the EKS cluster. | `string` | `"1.16"` | no | | config\_output\_path | Where to save the Kubectl config file (if `write_kubeconfig = true`). Assumed to be a directory if the value ends with a forward slash `/`. | `string` | `"./"` | no | | create\_eks | Controls if EKS resources should be created (it affects almost all resources) | `bool` | `true` | no | | eks\_oidc\_root\_ca\_thumbprint | Thumbprint of Root CA for EKS OIDC, Valid until 2037 | `string` | `"9e99a48a9960b14926bb7f3b02e22da2b0ab7280"` | no | diff --git a/docs/spot-instances.md b/docs/spot-instances.md index e8a31e45ab..1eb4da4257 100644 --- a/docs/spot-instances.md +++ b/docs/spot-instances.md @@ -32,7 +32,7 @@ Example worker group configuration that uses an ASG with launch configuration fo name = "on-demand-1" instance_type = "m4.xlarge" asg_max_size = 1 - kubelet_extra_args = "--node-labels=kubernetes.io/lifecycle=normal" + kubelet_extra_args = "--node-labels=node.kubernetes.io/lifecycle=normal" suspended_processes = ["AZRebalance"] }, { @@ -40,7 +40,7 @@ Example worker group configuration that uses an ASG with launch configuration fo spot_price = "0.199" instance_type = "c4.xlarge" asg_max_size = 20 - kubelet_extra_args = "--node-labels=kubernetes.io/lifecycle=spot" + kubelet_extra_args = "--node-labels=node.kubernetes.io/lifecycle=spot" suspended_processes = ["AZRebalance"] }, { @@ -48,7 +48,7 @@ Example worker group configuration that uses an ASG with launch configuration fo spot_price = "0.20" instance_type = "m4.xlarge" asg_max_size = 20 - kubelet_extra_args = "--node-labels=kubernetes.io/lifecycle=spot" + kubelet_extra_args = "--node-labels=node.kubernetes.io/lifecycle=spot" suspended_processes = ["AZRebalance"] } ] @@ -77,7 +77,7 @@ Launch Template support is a recent addition to both AWS and this module. It mig spot_instance_pools = 4 asg_max_size = 5 asg_desired_capacity = 5 - kubelet_extra_args = "--node-labels=kubernetes.io/lifecycle=spot" + kubelet_extra_args = "--node-labels=node.kubernetes.io/lifecycle=spot" public_ip = true }, ] diff --git a/examples/spot_instances/main.tf b/examples/spot_instances/main.tf index 6cb45e70fd..007cd60357 100644 --- a/examples/spot_instances/main.tf +++ b/examples/spot_instances/main.tf @@ -71,7 +71,7 @@ module "eks" { spot_instance_pools = 4 asg_max_size = 5 asg_desired_capacity = 5 - kubelet_extra_args = "--node-labels=kubernetes.io/lifecycle=spot" + kubelet_extra_args = "--node-labels=node.kubernetes.io/lifecycle=spot" public_ip = true }, ] diff --git a/variables.tf b/variables.tf index 3d6f8fabd2..b949524f05 100644 --- a/variables.tf +++ b/variables.tf @@ -28,7 +28,7 @@ variable "cluster_security_group_id" { variable "cluster_version" { description = "Kubernetes version to use for the EKS cluster." type = string - default = "1.15" + default = "1.16" } variable "config_output_path" {