feat: add support for Kubernetes v1.20.5

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#changelog-since-v1204
Azure · Mar 19, 2021 · ebc4d5e · ebc4d5e
1 parent 39dd736
commit ebc4d5e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -249,7 +249,8 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.20.1":         false,
 	"1.20.2":         false,
 	"1.20.3":         false,
-	"1.20.4":         true,
+	"1.20.4":         false,
+	"1.20.5":         true,
 	"1.21.0-alpha.1": false,
 	"1.21.0-alpha.2": false, // disabled, see https://github.com/kubernetes/kubernetes/issues/98419
 	"1.21.0-alpha.3": false,

diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
@@ -113,7 +113,7 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.17/windowszip/v1.17.17-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.16/windowszip/v1.18.16-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.8/windowszip/v1.19.8-1int.zip",
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.4/windowszip/v1.20.4-1int.zip",
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5/windowszip/v1.20.5-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-beta.1/windowszip/v1.21.0-beta.1-1int.zip"
         );
         "c:\akse-cache\win-vnet-cni\" = @(
@@ -295,7 +295,7 @@ function Update-WindowsFeatures {
 
 function Update-Registry {
     # if multple LB policies are included for same endpoint then HNS hangs.
-    # this fix forces an error  
+    # this fix forces an error
     Write-Host "Enable a HNS fix in 2021-2C+"
     Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name HNSControlFlag -Value 1 -Type DWORD
 }

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -233,7 +233,7 @@ echo "  - busybox" >> ${VHD_LOGS_FILEPATH}
 
 K8S_VERSIONS="
 1.21.0-beta.1
-1.20.4
+1.20.5
 1.19.8
 1.18.16
 1.18.15-azs
-Original file line number
+Diff line change
@@ Expand Up / @@ -233,7 +233,7 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH} @@
     K8S_VERSIONS="
 .21.0-beta.1
-.20.4
+.20.5
 .19.8
 .18.16
 .18.15-azs
@@ Expand Down @@