chore: support only latest, tested versions of Kubernetes (#4265)

Azure · Feb 12, 2021 · 1de0ab8 · 1de0ab8
1 parent f220f16
commit 1de0ab8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git 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,
@@ -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,9 +244,9 @@ 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.1": false,
 	"1.21.0-alpha.2": false, // disabled, see https://github.com/kubernetes/kubernetes/issues/98419
 	"1.21.0-alpha.3": true,
 }

diff --git 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"
         );

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -280,15 +280,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