From fae854bcef88b13d7d6397d091f783d19c2e858a Mon Sep 17 00:00:00 2001
From: diwakar thyagaraj <dt241s@att.com>
Date: Tue, 27 Jul 2021 20:39:55 +0000
Subject: [PATCH] Upgrade Kubernetes to 1.21.2

https://github.com/airshipit/airshipctl/issues/589

Change-Id: I2141b4637ffa9ebbd22ba6c46421a97e901dda12
Signed-off-by: diwakar thyagaraj <dt241s@att.com>
---
 bootstrap_capz/assets/help.txt       | 8 ++++----
 bootstrap_capz/azure-config.json     | 2 +-
 bootstrap_capz/azure-config.yaml     | 2 +-
 bootstrap_capz/config/aks_cluster.go | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bootstrap_capz/assets/help.txt b/bootstrap_capz/assets/help.txt
index dac01ff..0aa708c 100644
--- a/bootstrap_capz/assets/help.txt
+++ b/bootstrap_capz/assets/help.txt
@@ -18,10 +18,10 @@ spec:
     resourceGroup: <Azure Resource Group Name>
     region: <Azure Region, e.g., centralus>
     cluster:
-        k8sVersion: <Kubernetes version, e.g., 1.18.6>
+        k8sVersion: <Kubernetes version, e.g., 1.21.2>
         vmSize: <Azure Compute VM Type, e.g., Standard_B2s>
         replicas: <Node Replica Number for the cluster. Default is 1>
-        kubeconfig: <Kubernetes version, e.g., 1.18.2>
+        kubeconfig: <Kubernetes version, e.g., 1.21.2>
 </YAML>
 
 It also accepts the JSON file format.
@@ -42,10 +42,10 @@ It also accepts the JSON file format.
         "resourceGroup":"<Azure Resource Group Name>",
         "region":"<Azure Region, e.g., centralus>",
         "cluster":{
-            "k8sVersion":"<Kubernetes version, e.g., 1.18.6>",
+            "k8sVersion":"<Kubernetes version, e.g., 1.21.2>",
             "vmSize":"<Azure Compute VM Type, e.g., Standard_B2s>",
             "replicas":<Node Replica Number for the cluster>,
-            "kubeconfig":"<Kubernetes version, e.g., 1.18.2>"
+            "kubeconfig":"<Kubernetes version, e.g., 1.21.2>"
         }
     }
 }
diff --git a/bootstrap_capz/azure-config.json b/bootstrap_capz/azure-config.json
index 6afa44c..5803402 100644
--- a/bootstrap_capz/azure-config.json
+++ b/bootstrap_capz/azure-config.json
@@ -13,7 +13,7 @@
     "resourceGroup":"airship2-zuul-rg",
     "spec":{
         "cluster":{
-            "k8sVersion":"1.18.6",
+            "k8sVersion":"1.21.2",
             "kubeconfig":"capz.kubeconfig",
             "replicas":1,
             "vmSize":"Standard_B2s"
diff --git a/bootstrap_capz/azure-config.yaml b/bootstrap_capz/azure-config.yaml
index e4f7275..c5a98fb 100644
--- a/bootstrap_capz/azure-config.yaml
+++ b/bootstrap_capz/azure-config.yaml
@@ -22,7 +22,7 @@ spec:
     resourceGroup: airship2-zuul-rg
     region: centralus
     cluster:
-        k8sVersion: 1.18.6
+        k8sVersion: 1.21.2
         vmSize: Standard_B2s
         replicas: 1
         kubeconfig: capz.kubeconfig
diff --git a/bootstrap_capz/config/aks_cluster.go b/bootstrap_capz/config/aks_cluster.go
index 785c21a..3c3bf53 100644
--- a/bootstrap_capz/config/aks_cluster.go
+++ b/bootstrap_capz/config/aks_cluster.go
@@ -47,7 +47,7 @@ const (
 	defaultResourceGroup = "airship2-aks-rg"
 	defaultClusterName   = "capi-azure"
 	defaultVMSize        = "Standard_B2s"
-	defaultK8SVersion    = "1.18.6"
+	defaultK8SVersion    = "1.21.2"
 	defaultKubeconfig    = "kubeconfig"
 )