From f816ac68c6bc1c6ab81362f916489ad7ec873e56 Mon Sep 17 00:00:00 2001
From: Matt Boersma <Matt.Boersma@microsoft.com>
Date: Thu, 8 Apr 2021 12:42:52 -0600
Subject: [PATCH] feat: add support for Kubernetes v1.21.0

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md#changelog-since-v1200-1
---
 Jenkinsfile                          | 2 +-
 pkg/api/common/versions.go           | 3 ++-
 vhd/packer/configure-windows-vhd.ps1 | 2 +-
 vhd/packer/install-dependencies.sh   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 17c7397e64..666d0adfdd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ defaultEnv = [
 	] + params
 
 def k8sVersions = ["1.17", "1.18", "1.19", "1.20", "1.21"]
-def latestReleasedVersion = "1.20"
+def latestReleasedVersion = "1.21"
 def tasks = [:]
 def testConfigs = []
 
diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
index 460a762ba6..83a00c4c97 100644
--- a/pkg/api/common/versions.go
+++ b/pkg/api/common/versions.go
@@ -258,7 +258,8 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.21.0-alpha.3": false,
 	"1.21.0-beta.0":  false,
 	"1.21.0-beta.1":  false,
-	"1.21.0-rc.0":    true,
+	"1.21.0-rc.0":    false,
+	"1.21.0":         true,
 }
 
 // AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
index ddc9d9bfb3..ce0657d38c 100644
--- a/vhd/packer/configure-windows-vhd.ps1
+++ b/vhd/packer/configure-windows-vhd.ps1
@@ -120,7 +120,7 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17/windowszip/v1.18.17-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9/windowszip/v1.19.9-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5/windowszip/v1.20.5-1int.zip",
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-rc.0/windowszip/v1.21.0-rc.0-1int.zip"
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0/windowszip/v1.21.0-1int.zip"
         );
         "c:\akse-cache\win-vnet-cni\" = @(
             "https://kubernetesartifacts.azureedge.net/azure-cni/v1.2.2/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.2.2.zip",
diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
index 861f7155cd..4830874a18 100644
--- a/vhd/packer/install-dependencies.sh
+++ b/vhd/packer/install-dependencies.sh
@@ -232,7 +232,7 @@ loadContainerImage "busybox"
 echo "  - busybox" >> ${VHD_LOGS_FILEPATH}
 
 K8S_VERSIONS="
-1.21.0-rc.0
+1.21.0
 1.20.5
 1.19.9
 1.18.17