Skip to content

Commit

Permalink
Docs and TF: Update EKS Kubernetes version to use 1.16 (googleforgame…
Browse files Browse the repository at this point in the history
…s#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 <robertbailey@google.com>
  • Loading branch information
2 people authored and ilkercelikyilmaz committed Oct 23, 2020
1 parent 0e38c4f commit 68d6175
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
8 changes: 4 additions & 4 deletions install/terraform/modules/eks/eks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
}

provider "aws" {
version = "= 2.51.0"
version = ">= 2.55.0"
region = var.region
}

Expand Down Expand Up @@ -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"
Expand All @@ -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 = [
{
Expand Down
15 changes: 15 additions & 0 deletions site/content/en/docs/Installation/Creating Cluster/eks.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down

0 comments on commit 68d6175

Please sign in to comment.