github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-03-27 03:41:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Change EKS default version to 1.16 (#857)

Browse Source
This commit is contained in:
Scott Crooks
2020-05-06 17:20:28 +02:00
committed by GitHub
parent 9bfdba9fb8
commit 99f59bfcc9
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@@ -1,6 +1,6 @@
repos: repos:
- repo: git://github.com/antonbabenko/pre-commit-terraform - repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.27.0 rev: v1.30.0
hooks: hooks:
- id: terraform_fmt - id: terraform_fmt
- id: terraform_docs - id: terraform_docs

4
README.md
View File

@@ -39,7 +39,7 @@ provider "kubernetes" {
module "my-cluster" { module "my-cluster" {
source = "terraform-aws-modules/eks/aws" source = "terraform-aws-modules/eks/aws"
cluster_name = "my-cluster" cluster_name = "my-cluster"
cluster_version = "1.14" cluster_version = "1.16"
subnets = ["subnet-abcde012", "subnet-bcde012a", "subnet-fghi345a"] subnets = ["subnet-abcde012", "subnet-bcde012a", "subnet-fghi345a"]
vpc_id = "vpc-1234556abcdef" 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\_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\_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\_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 | | 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 | | 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 | | eks\_oidc\_root\_ca\_thumbprint | Thumbprint of Root CA for EKS OIDC, Valid until 2037 | `string` | `"9e99a48a9960b14926bb7f3b02e22da2b0ab7280"` | no |

8
docs/spot-instances.md
View File

@@ -32,7 +32,7 @@ Example worker group configuration that uses an ASG with launch configuration fo
name = "on-demand-1" name = "on-demand-1"
instance_type = "m4.xlarge" instance_type = "m4.xlarge"
asg_max_size = 1 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"] suspended_processes = ["AZRebalance"]
}, },
{ {
@@ -40,7 +40,7 @@ Example worker group configuration that uses an ASG with launch configuration fo
spot_price = "0.199" spot_price = "0.199"
instance_type = "c4.xlarge" instance_type = "c4.xlarge"
asg_max_size = 20 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"] suspended_processes = ["AZRebalance"]
}, },
{ {
@@ -48,7 +48,7 @@ Example worker group configuration that uses an ASG with launch configuration fo
spot_price = "0.20" spot_price = "0.20"
instance_type = "m4.xlarge" instance_type = "m4.xlarge"
asg_max_size = 20 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"] 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 spot_instance_pools = 4
asg_max_size = 5 asg_max_size = 5
asg_desired_capacity = 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 public_ip = true
}, },
] ]

2
examples/spot_instances/main.tf
View File

@@ -71,7 +71,7 @@ module "eks" {
spot_instance_pools = 4 spot_instance_pools = 4
asg_max_size = 5 asg_max_size = 5
asg_desired_capacity = 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 public_ip = true
}, },
] ]

2
variables.tf
View File

@@ -28,7 +28,7 @@ variable "cluster_security_group_id" {
variable "cluster_version" { variable "cluster_version" {
description = "Kubernetes version to use for the EKS cluster." description = "Kubernetes version to use for the EKS cluster."
type = string type = string
default = "1.15" default = "1.16"
} }
variable "config_output_path" { variable "config_output_path" {