add Kubernetes v1.8.13 support (#2975)

Azure · May 16, 2018 · 49ebb20 · 49ebb20
1 parent 87408da
commit 49ebb20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -38,6 +38,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.8.10":         true,
 	"1.8.11":         true,
 	"1.8.12":         true,
+	"1.8.13":         true,
 	"1.9.0":          true,
 	"1.9.1":          true,
 	"1.9.2":          true,
@@ -205,6 +206,7 @@ func getAllKubernetesWindowsSupportedVersionsMap() map[string]bool {
 		"1.6.13",
 		"1.7.0",
 		"1.7.1",
+		"1.8.13",
 		"1.10.0-beta.2",
 		"1.10.0-beta.4",
 		"1.10.0-rc.1",

diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -157,6 +157,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 		})
 
 		It("should be running the expected version", func() {
+			hasWindows := eng.HasWindowsAgents()
 			version, err := node.Version()
 			Expect(err).NotTo(HaveOccurred())
 
@@ -167,13 +168,13 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 					common.Kubernetes,
 					eng.ClusterDefinition.Properties.OrchestratorProfile.OrchestratorRelease,
 					eng.ClusterDefinition.Properties.OrchestratorProfile.OrchestratorVersion,
-					false)
+					hasWindows)
 			} else {
 				expectedVersion = common.RationalizeReleaseAndVersion(
 					common.Kubernetes,
 					eng.Config.OrchestratorRelease,
 					eng.Config.OrchestratorVersion,
-					false)
+					hasWindows)
 			}
 			expectedVersionRationalized := strings.Split(expectedVersion, "-")[0] // to account for -alpha and -beta suffixes
 			Expect(version).To(Equal("v" + expectedVersionRationalized))