From 8a04c307029d4aed1f1b5752e8498ca6ebde0a4b Mon Sep 17 00:00:00 2001
From: "Thomas S. Pangborn" <32514746+thpang@users.noreply.github.com>
Date: Mon, 31 Jan 2022 15:52:12 -0500
Subject: [PATCH] (IAC-394) [AWS] update viya4-iac-aws from k8s 1.19 to 1.21
(#119) (#120)
---
Dockerfile | 2 +-
README.md | 2 +-
docs/CONFIG-VARS.md | 2 +-
examples/sample-input-byo.tfvars | 2 +-
examples/sample-input-custom-data.tfvars | 2 +-
examples/sample-input-ha.tfvars | 2 +-
examples/sample-input-minimal.tfvars | 2 +-
examples/sample-input.tfvars | 2 +-
variables.tf | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index bda19f3d..f63e7e97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG AWS_CLI_VERSION=2.1.29
FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
FROM amazon/aws-cli:$AWS_CLI_VERSION
-ARG KUBECTL_VERSION=1.19.9
+ARG KUBECTL_VERSION=1.21.7
WORKDIR /viya4-iac-aws
diff --git a/README.md b/README.md
index 971eec42..66f71531 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ The following are also required:
#### Terraform Requirements:
- [Terraform](https://www.terraform.io/downloads.html) v1.0.0
-- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) - v1.19.9
+- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) - v1.21.7
- [jq](https://stedolan.github.io/jq/) v1.6
- [AWS CLI](https://aws.amazon.com/cli) (optional; useful as an alternative to the AWS Web Console) v2.1.29
diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md
index 5ec96e11..7e59b192 100644
--- a/docs/CONFIG-VARS.md
+++ b/docs/CONFIG-VARS.md
@@ -194,7 +194,7 @@ Custom policy:
| Name
| Description
| Type
| Default
| Notes
|
| :--- | :--- | :--- | :--- | :--- |
| create_static_kubeconfig | Allows the user to create a provider- or service account-based kubeconfig file | bool | false | A value of `false` defaults to using the cloud provider's mechanism for generating the kubeconfig file. A value of `true` creates a static kubeconfig that uses a service account and cluster role binding to provide credentials. |
-| kubernetes_version | The EKS cluster Kubernetes version | string | "1.19" | |
+| kubernetes_version | The EKS cluster Kubernetes version | string | "1.21" | |
| create_jump_vm | Create bastion host (jump VM) | bool | true| |
| create_jump_public_ip | Add public IP address to jump VM | bool | true | |
| jump_vm_admin | OS admin user for the jump VM | string | "jumpuser" | |
diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars
index 63d8ffd9..a4d7f87c 100644
--- a/examples/sample-input-byo.tfvars
+++ b/examples/sample-input-byo.tfvars
@@ -37,7 +37,7 @@ postgres_servers = {
}
## Cluster config
-kubernetes_version = "1.19"
+kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
diff --git a/examples/sample-input-custom-data.tfvars b/examples/sample-input-custom-data.tfvars
index 7c9ef1df..9e0df855 100644
--- a/examples/sample-input-custom-data.tfvars
+++ b/examples/sample-input-custom-data.tfvars
@@ -27,7 +27,7 @@ postgres_servers = {
}
## Cluster config
-kubernetes_version = "1.19"
+kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars
index fe1576fa..5f3c4c41 100644
--- a/examples/sample-input-ha.tfvars
+++ b/examples/sample-input-ha.tfvars
@@ -30,7 +30,7 @@ postgres_servers = {
ssh_public_key = "~/.ssh/id_rsa.pub"
## Cluster config
-kubernetes_version = "1.19"
+kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars
index a1b82bd0..038b6210 100644
--- a/examples/sample-input-minimal.tfvars
+++ b/examples/sample-input-minimal.tfvars
@@ -27,7 +27,7 @@ tags = { } # e.g., { "key1" = "value1", "key2
# }
## Cluster config
-kubernetes_version = "1.19"
+kubernetes_version = "1.21"
default_nodepool_node_count = 1
default_nodepool_vm_type = "m5.large"
default_nodepool_custom_data = ""
diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars
index 1cb12224..1488e7ff 100644
--- a/examples/sample-input.tfvars
+++ b/examples/sample-input.tfvars
@@ -27,7 +27,7 @@ postgres_servers = {
}
## Cluster config
-kubernetes_version = "1.19"
+kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
diff --git a/variables.tf b/variables.tf
index 6a29de6a..f45e2aac 100644
--- a/variables.tf
+++ b/variables.tf
@@ -95,7 +95,7 @@ variable efs_performance_mode {
## Kubernetes
variable "kubernetes_version" {
description = "The EKS cluster Kubernetes version"
- default = "1.19"
+ default = "1.21"
}
variable "tags" {