v1.9 clusters have 443-enabled dashboards (#1988)

Azure · Jan 4, 2018 · fc9ffbe · fc9ffbe
1 parent 4fefc83
commit fc9ffbe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -325,6 +325,12 @@ workflows:
           filters:
             branches:
               ignore: master
+      - k8s-1.9-release-e2e:
+          requires:
+            - pr-e2e-hold
+          filters:
+            branches:
+              ignore: master
       - swarm-e2e:
           requires:
             - pr-e2e-hold
@@ -385,6 +391,12 @@ workflows:
           filters:
             branches:
               only: master
+      - k8s-1.9-release-e2e:
+          requires:
+            - test
+          filters:
+            branches:
+              only: master
       - swarm-e2e:
           requires:
             - test

diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -134,7 +134,11 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 
 			s, err := service.Get("kubernetes-dashboard", "kube-system")
 			Expect(err).NotTo(HaveOccurred())
-			port := s.GetNodePort(80)
+			dashboardPort := 80
+			if eng.ClusterDefinition.Properties.OrchestratorProfile.OrchestratorRelease == "1.9" {
+				dashboardPort = 443
+			}
+			port := s.GetNodePort(dashboardPort)
 
 			master := fmt.Sprintf("azureuser@%s", kubeConfig.GetServerName())
 			nodeList, err := node.Get()