From 9d63eaf9ac69fa31894ad77a5ccaf1e83fc6b6ac Mon Sep 17 00:00:00 2001
From: Matt Boersma <Matt.Boersma@microsoft.com>
Date: Wed, 23 Dec 2020 08:09:58 -0700
Subject: [PATCH] feat: add support for Kubernetes v1.19.6 (#4140)

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

diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
index acf975301e..403cf576e5 100644
--- a/pkg/api/common/versions.go
+++ b/pkg/api/common/versions.go
@@ -229,8 +229,9 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.19.1":         false,
 	"1.19.2":         false,
 	"1.19.3":         false,
-	"1.19.4":         true,
+	"1.19.4":         false,
 	"1.19.5":         true,
+	"1.19.6":         true,
 	"1.20.0-alpha.1": false,
 	"1.20.0-alpha.2": false,
 	"1.20.0-alpha.3": false,
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
index b42ef42998..fe57540d5c 100644
--- a/vhd/packer/configure-windows-vhd.ps1
+++ b/vhd/packer/configure-windows-vhd.ps1
@@ -117,9 +117,9 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.10/windowszip/v1.18.10-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.12/windowszip/v1.18.12-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.13/windowszip/v1.18.13-1int.zip",
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.3/windowszip/v1.19.3-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.4/windowszip/v1.19.4-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.5/windowszip/v1.19.5-1int.zip",
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6/windowszip/v1.19.6-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.0/windowszip/v1.20.0-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.1/windowszip/v1.20.1-1int.zip"
         );
diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
index 36cac10eea..765bfcf25c 100644
--- a/vhd/packer/install-dependencies.sh
+++ b/vhd/packer/install-dependencies.sh
@@ -369,8 +369,8 @@ echo "  - busybox" >> ${VHD_LOGS_FILEPATH}
 K8S_VERSIONS="
 1.20.1
 1.20.0
+1.19.6
 1.19.5
-1.19.4
 1.18.13
 1.18.12
 1.18.10-azs