From 68d61759c4c41c9463b227db3cdf7aee5c298687 Mon Sep 17 00:00:00 2001 From: Alexander Apalikov Date: Wed, 16 Sep 2020 20:25:05 +0300 Subject: [PATCH] Docs and TF: Update EKS Kubernetes version to use 1.16 (#1790) * Update EKS Kubernetes version to use 1.16 Update Terraform and website to use 1.16 version. * Update terraform-aws-eks version to the latest Tested this version, both apply and two stages destruction works fine, no resources left behind. Co-authored-by: Robert Bailey --- install/terraform/modules/eks/eks.tf | 8 ++++---- .../en/docs/Installation/Creating Cluster/eks.md | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/install/terraform/modules/eks/eks.tf b/install/terraform/modules/eks/eks.tf index 1ec6af2c4b..4d9892a6de 100644 --- a/install/terraform/modules/eks/eks.tf +++ b/install/terraform/modules/eks/eks.tf @@ -18,7 +18,7 @@ terraform { } provider "aws" { - version = "= 2.51.0" + version = ">= 2.55.0" region = var.region } @@ -58,7 +58,7 @@ resource "aws_security_group" "worker_group_mgmt_one" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "2.21.0" + version = "2.47.0" name = "test-vpc-lt" cidr = "10.0.0.0/16" @@ -77,11 +77,11 @@ module "vpc" { } module "eks" { - source = "git::github.com/terraform-aws-modules/terraform-aws-eks.git?ref=v7.0.1" + source = "git::github.com/terraform-aws-modules/terraform-aws-eks.git?ref=v12.2.0" cluster_name = var.cluster_name subnets = module.vpc.public_subnets vpc_id = module.vpc.vpc_id - cluster_version = "1.15" + cluster_version = "1.16" worker_groups_launch_template = [ { diff --git a/site/content/en/docs/Installation/Creating Cluster/eks.md b/site/content/en/docs/Installation/Creating Cluster/eks.md index 0227893cca..84a1d0a0b4 100644 --- a/site/content/en/docs/Installation/Creating Cluster/eks.md +++ b/site/content/en/docs/Installation/Creating Cluster/eks.md @@ -15,6 +15,7 @@ Possible steps are the following: 1. Run `aws configure` to authorize your `awscli` with proper `AWS Access Key ID` and `AWS Secret Access Key`. 1. Create an example cluster: +{{% feature expiryVersion="1.9.0" %}} ``` eksctl create cluster \ --name prod \ @@ -26,6 +27,20 @@ eksctl create cluster \ --nodes-max 4 \ --node-ami auto ``` +{{% /feature %}} +{{% feature publishVersion="1.9.0" %}} +``` +eksctl create cluster \ +--name prod \ +--version 1.16 \ +--nodegroup-name standard-workers \ +--node-type t3.medium \ +--nodes 3 \ +--nodes-min 3 \ +--nodes-max 4 \ +--node-ami auto +``` +{{% /feature %}} {{< alert title="Note" color="info">}} EKS does not use the normal Kubernetes networking since it