From 92cc65a7b2fd85f982d140b226a99e117a19176d Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 3 Mar 2021 15:38:22 -0700 Subject: [PATCH] feat: add support for Kubernetes v1.20.5 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#changelog-since-v1204 --- pkg/api/common/versions.go | 3 ++- vhd/packer/configure-windows-vhd.ps1 | 4 ++-- vhd/packer/install-dependencies.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 8fe077e5b7..50269af058 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -250,7 +250,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 index 37f6bc79b6..449424934b 100644 --- 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.9/windowszip/v1.19.9-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 index f3d83898bf..66e3386106 100644 --- 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.9 1.18.16 1.18.15-azs