From b6aa398a8f95378c1f3b48c63b6a6dfbc1cc96ab Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Thu, 11 Feb 2021 12:38:04 -0700 Subject: [PATCH] feat: add support for Kubernetes 1.21.0-alpha.3 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md#changelog-since-v1210-alpha2 --- pkg/api/common/versions.go | 2 ++ vhd/packer/configure-windows-vhd.ps1 | 2 +- vhd/packer/install-dependencies.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 6b159657c2..157636c0cb 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -247,6 +247,8 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.20.1": true, "1.20.2": true, "1.21.0-alpha.1": true, + "1.21.0-alpha.2": false, // disabled, see https://github.com/kubernetes/kubernetes/issues/98419 + "1.21.0-alpha.3": 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 d4f1667681..3025002c8e 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -126,7 +126,7 @@ function Get-FilesToCacheOnVHD { "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", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2/windowszip/v1.20.2-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-alpha.1/windowszip/v1.21.0-alpha.1-1int.zip" + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-alpha.3/windowszip/v1.21.0-alpha.3-1int.zip" ); "c:\akse-cache\win-vnet-cni\" = @( "https://kubernetesartifacts.azureedge.net/azure-cni/v1.1.6/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.1.6.zip", diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index a57a77d22b..7b7da25ed5 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -280,7 +280,7 @@ pullContainerImage "docker" "busybox" echo " - busybox" >> ${VHD_LOGS_FILEPATH} K8S_VERSIONS=" -1.21.0-alpha.1 +1.21.0-alpha.3 1.20.2 1.20.1 1.19.7