From 9c37d3ff49982740194c72fa1be99340b4b0d99a Mon Sep 17 00:00:00 2001
From: "Thomas S. Pangborn" <32514746+thpang@users.noreply.github.com>
Date: Mon, 31 Jan 2022 15:52:22 -0500
Subject: [PATCH] (IAC-396) Update viya4-iac-gcp default K8s version to 1.21.x
 (#117) (#119)

---
 Dockerfile                           | 2 +-
 README.md                            | 2 +-
 examples/sample-input-byo.tfvars     | 1 +
 examples/sample-input-ha.tfvars      | 1 +
 examples/sample-input-minimal.tfvars | 1 +
 examples/sample-input.tfvars         | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f87a51a..b606483 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG GCP_CLI_VERSION=342.0.0
 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
 
 FROM google/cloud-sdk:$GCP_CLI_VERSION
-ARG KUBECTL_VERSION=1.19.9
+ARG KUBECTL_VERSION=1.21.7
 
 WORKDIR /viya4-iac-gcp
 
diff --git a/README.md b/README.md
index 9cd90bb..e94106c 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Operational knowledge of
 - Terraform or Docker
   - #### Terraform
     - [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
     - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v342.0.0
   - #### Docker
diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars
index 9a914ff..e40067f 100644
--- a/examples/sample-input-byo.tfvars
+++ b/examples/sample-input-byo.tfvars
@@ -37,6 +37,7 @@ postgres_servers = {
 }
 
 # GKE config
+kubernetes_version = "1.21.6-gke.1500"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type    = "e2-standard-8"
 
diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars
index c499396..77b6d60 100644
--- a/examples/sample-input-ha.tfvars
+++ b/examples/sample-input-ha.tfvars
@@ -27,6 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
+kubernetes_version = "1.21.6-gke.1500"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type    = "e2-standard-8"
 
diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars
index 4736c51..499af3a 100644
--- a/examples/sample-input-minimal.tfvars
+++ b/examples/sample-input-minimal.tfvars
@@ -27,6 +27,7 @@ tags = {} # e.g., { "key1" = "value1", "key2" = "value2" }
 # }
 
 # GKE config
+kubernetes_version = "1.21.6-gke.1500"
 default_nodepool_min_nodes = 1
 default_nodepool_vm_type   = "n2-standard-2"
 
diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars
index 67fdbd8..c239a88 100644
--- a/examples/sample-input.tfvars
+++ b/examples/sample-input.tfvars
@@ -27,6 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
+kubernetes_version = "1.21.6-gke.1500"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type    = "e2-standard-8"