diff --git a/.travis.yml b/.travis.yml index c5fb533..7954f76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - bundle install before_script: -- export TERRAFORM_VERSION=0.12.2 +- export TERRAFORM_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version') - curl --silent --output terraform.zip "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 93a7cb6..e20a78b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ project adheres to [Semantic Versioning](http://semver.org/). - Update EBS optimized instances type (by @gloutsch) - Added tagging for iam role created in `./cluster.tf` (@camilosantana) - Enable log retention for cloudwatch log groups (by @yuriipolishchuk) +- Update to EKS 1.13 (by @gloutsch) ### Changed diff --git a/README.md b/README.md index fd2a79f..262fbb0 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,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 ingres/egress to work with the workers and provide API access to your current IP/32. | string | `""` | no | -| cluster\_version | Kubernetes version to use for the EKS cluster. | string | `"1.12"` | no | +| cluster\_version | Kubernetes version to use for the EKS cluster. | string | `"1.13"` | no | | config\_output\_path | Where to save the Kubectl config file (if `write_kubeconfig = true`). Should end in a forward slash `/` . | string | `"./"` | no | | iam\_path | If provided, all IAM roles will be created on this path. | string | `"/"` | no | | kubeconfig\_aws\_authenticator\_additional\_args | Any additional arguments to pass to the authenticator such as the role to assume. e.g. ["-r", "MyEksRole"]. | list(string) | `[]` | no | diff --git a/examples/basic/main.tf b/examples/basic/main.tf index b2d3ac5..629c10b 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -11,6 +11,18 @@ provider "random" { version = "~> 2.1" } +provider "local" { + version = "~> 1.2" +} + +provider "null" { + version = "~> 2.1" +} + +provider "template" { + version = "~> 2.1" +} + data "aws_availability_zones" "available" { } @@ -131,4 +143,3 @@ module "eks" { map_users = var.map_users map_accounts = var.map_accounts } - diff --git a/examples/launch_templates/main.tf b/examples/launch_templates/main.tf index edc18e2..91cfd98 100644 --- a/examples/launch_templates/main.tf +++ b/examples/launch_templates/main.tf @@ -11,6 +11,18 @@ provider "random" { version = "~> 2.1" } +provider "local" { + version = "~> 1.2" +} + +provider "null" { + version = "~> 2.1" +} + +provider "template" { + version = "~> 2.1" +} + data "aws_availability_zones" "available" { } @@ -58,4 +70,3 @@ module "eks" { }, ] } - diff --git a/examples/spot_instances/main.tf b/examples/spot_instances/main.tf index dc18c0e..7c699c9 100644 --- a/examples/spot_instances/main.tf +++ b/examples/spot_instances/main.tf @@ -11,6 +11,18 @@ provider "random" { version = "~> 2.1" } +provider "local" { + version = "~> 1.2" +} + +provider "null" { + version = "~> 2.1" +} + +provider "template" { + version = "~> 2.1" +} + data "aws_availability_zones" "available" { } @@ -55,4 +67,3 @@ module "eks" { }, ] } - diff --git a/variables.tf b/variables.tf index 3d01ebb..1ec8e48 100644 --- a/variables.tf +++ b/variables.tf @@ -24,7 +24,7 @@ variable "cluster_security_group_id" { variable "cluster_version" { description = "Kubernetes version to use for the EKS cluster." type = string - default = "1.12" + default = "1.13" } variable "config_output_path" { @@ -239,4 +239,3 @@ variable "manage_worker_iam_resources" { type = bool default = true } -