From d91dac606f1ae3c78c448b24c3a04fefdaa02611 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 12 Feb 2021 10:10:34 -0800 Subject: [PATCH 1/3] chore: support only latest, tested versions of Kubernetes --- pkg/api/common/versions.go | 8 ++++---- vhd/packer/install-dependencies.sh | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 157636c0cb..b623e1b6dd 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -197,7 +197,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.17.13": false, "1.17.14": false, // disabled, see https://github.com/kubernetes/kubernetes/pull/96623 "1.17.15": false, // replaced by 1.17.16 due to k8s release engineering issues - "1.17.16": true, + "1.17.16": false, "1.17.17": true, "1.18.0-alpha.1": false, "1.18.0-alpha.2": false, @@ -218,7 +218,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.18.11": false, // replaced by 1.18.12 due to k8s release engineering issues "1.18.12": false, "1.18.13": false, - "1.18.14": true, + "1.18.14": false, "1.18.15": true, "1.19.0-alpha.1": false, "1.19.0-alpha.2": false, @@ -234,7 +234,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.19.3": false, "1.19.4": false, "1.19.5": false, - "1.19.6": true, + "1.19.6": false, "1.19.7": true, "1.20.0-alpha.1": false, "1.20.0-alpha.2": false, @@ -244,7 +244,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.20.0-beta.2": false, "1.20.0-rc.0": false, "1.20.0": false, - "1.20.1": true, + "1.20.1": false, "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 diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index ab116f2275..430dc9b1c6 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -283,15 +283,11 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH} K8S_VERSIONS=" 1.21.0-alpha.3 1.20.2 -1.20.1 1.19.7 -1.19.6 1.18.15 1.18.15-azs -1.18.14 1.17.17 1.17.17-azs -1.17.16 " for KUBERNETES_VERSION in ${K8S_VERSIONS}; do for component in kube-apiserver kube-controller-manager kube-proxy kube-scheduler; do From 78fcc57a09ac8c54228488004b2c78d834afbfcc Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 12 Feb 2021 10:24:18 -0800 Subject: [PATCH 2/3] update versions support --- pkg/api/common/versions.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index b623e1b6dd..71fe2834e7 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -16,7 +16,7 @@ import ( // The bool value indicates if creating new clusters with this version is allowed var AllKubernetesSupportedVersions = map[string]bool{ "1.6.6": false, - "1.6.9": true, // need to keep 1.6.9 version support for v20160930 + "1.6.9": false, "1.6.11": false, "1.6.12": false, "1.6.13": false, @@ -246,7 +246,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.20.0": false, "1.20.1": false, "1.20.2": true, - "1.21.0-alpha.1": 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, } From 57c3e60d57fb55e7ebbc325cd3a01622eaa4aca2 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 12 Feb 2021 10:39:51 -0800 Subject: [PATCH 3/3] remove unsupported versions from Windows VHDs --- vhd/packer/configure-windows-vhd.ps1 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1 index 3025002c8e..536a243620 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -105,26 +105,11 @@ function Get-FilesToCacheOnVHD { "https://kubernetesartifacts.azureedge.net/csi-proxy/v0.2.2/binaries/csi-proxy-v0.2.2.tar.gz" ); "c:\akse-cache\win-k8s\" = @( - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.14-azs/windowszip/v1.16.14-azs-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.15-azs/windowszip/v1.16.15-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.17-azs/windowszip/v1.17.17-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.15-azs/windowszip/v1.18.15-azs-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.13/windowszip/v1.16.13-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.13-hotfix.20200714/windowszip/v1.16.13-hotfix.20200714-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.13-hotfix.20200817/windowszip/v1.16.13-hotfix.20200817-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.14/windowszip/v1.16.14-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.15/windowszip/v1.16.15-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.13/windowszip/v1.17.13-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.16/windowszip/v1.17.16-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.17/windowszip/v1.17.17-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.13/windowszip/v1.18.13-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14/windowszip/v1.18.14-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.15/windowszip/v1.18.15-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.19.7/windowszip/v1.19.7-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", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2/windowszip/v1.20.2-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-alpha.3/windowszip/v1.21.0-alpha.3-1int.zip" );