chore: deprecate Kubernetes 1.17 support (#4553)

Azure · Jul 1, 2021 · a5a6325 · a5a6325
1 parent 1c8aaa5
commit a5a6325
Show file tree

Hide file tree

Showing 22 changed files with 68 additions and 401 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,7 +6,7 @@ defaultEnv = [
 	VALIDATE_CPU_LOAD: false,
 	] + params
 
-def k8sVersions = ["1.17", "1.18", "1.19", "1.20", "1.21", "1.22"]
+def k8sVersions = ["1.18", "1.19", "1.20", "1.21", "1.22"]
 def latestReleasedVersion = "1.21"
 def tasks = [:]
 def testConfigs = []

diff --git a/cmd/generate_test.go b/cmd/generate_test.go
@@ -562,11 +562,6 @@ func TestExampleAPIModels(t *testing.T) {
 			apiModelPath: "../examples/kubernetes-msi-userassigned/kube-vmss.json",
 			setArgs:      defaultSet,
 		},
-		{
-			name:         "1.17 example",
-			apiModelPath: "../examples/kubernetes-releases/kubernetes1.17.json",
-			setArgs:      defaultSet,
-		},
 		{
 			name:         "1.18 example",
 			apiModelPath: "../examples/kubernetes-releases/kubernetes1.18.json",

diff --git a/docs/topics/kubernetes-developers.md b/docs/topics/kubernetes-developers.md
@@ -76,10 +76,10 @@ After that, you will have to upload a tarball (`_output/release-tars/kubernetes-
 
 ### AKS Engine API Model
 
-* Open the AKS Engine API Model (e.g. a file from the examples directory). Set `orchestratorRelease` to 1.17 or higher so various defaults and configuration are properly applied to the ARM template and artifacts. Additionally, add the following to the `kubernetesConfig` section:
+* Open the AKS Engine API Model (e.g. a file from the examples directory). Set `orchestratorRelease` to 1.18 or higher so various defaults and configuration are properly applied to the ARM template and artifacts. Additionally, add the following to the `kubernetesConfig` section:
 
 ```
-"orchestratorRelease": "1.17",
+"orchestratorRelease": "1.18",
 "kubernetesConfig": {
     ...
     "customKubeAPIServerImage": "<your-docker-registry>/kube-apiserver-amd64:<your-custom-tag>",

diff --git a/examples/azure-stack/conformance/kubernetes1.17.json b/examples/azure-stack/conformance/kubernetes1.17.json
diff --git a/examples/kubernetes-releases/kubernetes1.17.json b/examples/kubernetes-releases/kubernetes1.17.json
diff --git a/pkg/api/common/const.go b/pkg/api/common/const.go
@@ -61,9 +61,9 @@ const (
 	// KubernetesDefaultReleaseWindows is the default Kubernetes release for Windows
 	KubernetesDefaultReleaseWindows string = "1.18"
 	// KubernetesDefaultReleaseAzureStack is the default Kubernetes release on Azure Stack
-	KubernetesDefaultReleaseAzureStack string = "1.17"
+	KubernetesDefaultReleaseAzureStack string = "1.18"
 	// KubernetesDefaultReleaseWindowsAzureStack is the default Kubernetes release for Windows on Azure Stack
-	KubernetesDefaultReleaseWindowsAzureStack string = "1.17"
+	KubernetesDefaultReleaseWindowsAzureStack string = "1.18"
 )
 
 const LegacyControlPlaneVMPrefix string = "k8s-master"

diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -198,7 +198,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"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":        false,
-	"1.17.17":        true,
+	"1.17.17":        false,
 	"1.18.0-alpha.1": false,
 	"1.18.0-alpha.2": false,
 	"1.18.0-alpha.3": false,
@@ -296,7 +296,7 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{
 	"1.17.7":  false,
 	"1.17.9":  false,
 	"1.17.11": false,
-	"1.17.17": true,
+	"1.17.17": false,
 	"1.18.10": false,
 	"1.18.15": false,
 	"1.18.18": true,
@@ -321,7 +321,7 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{
 	"1.17.7":  false,
 	"1.17.9":  false,
 	"1.17.11": false,
-	"1.17.17": true,
+	"1.17.17": false,
 	"1.18.10": false,
 	"1.18.15": false,
 	"1.18.18": true,

diff --git a/pkg/api/defaults.go b/pkg/api/defaults.go
@@ -1169,14 +1169,13 @@ func (cs *ContainerService) getDefaultKubernetesClusterSubnetIPv6() string {
 func (cs *ContainerService) setCSIProxyDefaults() {
 	p := cs.Properties
 	useCloudControllerManager := p.OrchestratorProfile.KubernetesConfig != nil && to.Bool(p.OrchestratorProfile.KubernetesConfig.UseCloudControllerManager)
-	k8sVersion := p.OrchestratorProfile.OrchestratorVersion
 	w := p.WindowsProfile
 	// We should enable CSI proxy if:
 	// 1. enableCSIProxy is not defined and cloud-controller-manager
-	//    is being used on a Windows cluster with K8s >= 1.18.0 or
+	//    is being used on a Windows cluster or
 	// 2. enabledCSIProxy is true
 	// 3. csiProxyURL is defined
-	shouldEnableCSIProxy := (w.EnableCSIProxy == nil && useCloudControllerManager && common.IsKubernetesVersionGe(k8sVersion, "1.18.0")) ||
+	shouldEnableCSIProxy := (w.EnableCSIProxy == nil && useCloudControllerManager) ||
 		w.IsCSIProxyEnabled() ||
 		w.CSIProxyURL != ""