From 30bb3381fdc7cdfee6ab734c1d0e9224d4dd509d Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 1 Mar 2021 11:51:46 -0700 Subject: [PATCH] feat: add support for Kubernetes 1.21.0-beta.0 (#4300) See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md#changelog-since-v1210-alpha3 --- 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 f8470042c4..b3819a4d74 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -252,7 +252,8 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.20.4": 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": true, + "1.21.0-alpha.3": false, + "1.21.0-beta.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 e065becfe5..67a70eaa8b 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -111,7 +111,7 @@ function Get-FilesToCacheOnVHD { "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.21.0-alpha.3/windowszip/v1.21.0-alpha.3-1int.zip" + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-beta.0/windowszip/v1.21.0-beta.0-1int.zip" ); "c:\akse-cache\win-vnet-cni\" = @( "https://kubernetesartifacts.azureedge.net/azure-cni/v1.2.0_hotfix/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.2.0_hotfix.zip", diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index 08b68557b8..509a1a77a4 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-alpha.3 +1.21.0-beta.0 1.20.4 1.19.8 1.18.16