From a0d610df793d5792e549d7711ebb1d761531183a Mon Sep 17 00:00:00 2001
From: Subhas Dandapani <rdsubhas@gmail.com>
Date: Tue, 21 Jun 2016 04:10:28 +0200
Subject: [PATCH] Fixed nodePort for dashboard #185

---
 deploy/addons/dashboard-svc.yaml |  1 +
 test/integration/addons_test.go  | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/deploy/addons/dashboard-svc.yaml b/deploy/addons/dashboard-svc.yaml
index da3ba941e2..b6a69b3456 100644
--- a/deploy/addons/dashboard-svc.yaml
+++ b/deploy/addons/dashboard-svc.yaml
@@ -26,5 +26,6 @@ spec:
   ports:
   - port: 80
     targetPort: 9090
+    nodePort: 30000
   selector:
     app: kubernetes-dashboard
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index fa02cf21d8..3143c2cc66 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -31,7 +31,8 @@ import (
 
 var (
 	addonManagerCmd = []string{"get", "pod", "kube-addon-manager-127.0.0.1", "--namespace=kube-system"}
-	dashboardCmd    = []string{"get", "rc", "kubernetes-dashboard", "--namespace=kube-system"}
+	dashboardRcCmd  = []string{"get", "rc", "kubernetes-dashboard", "--namespace=kube-system"}
+	dashboardSvcCmd = []string{"get", "svc", "kubernetes-dashboard", "--namespace=kube-system"}
 )
 
 func TestAddons(t *testing.T) {
@@ -64,13 +65,23 @@ func TestDashboard(t *testing.T) {
 
 	checkDashboard := func() error {
 		rc := api.ReplicationController{}
-		if err := kubectlRunner.RunCommandParseOutput(dashboardCmd, &rc); err != nil {
+		svc := api.Service{}
+		if err := kubectlRunner.RunCommandParseOutput(dashboardRcCmd, &rc); err != nil {
+			return err
+		}
+
+		if err := kubectlRunner.RunCommandParseOutput(dashboardSvcCmd, &svc); err != nil {
 			return err
 		}
 
 		if rc.Status.Replicas != rc.Status.FullyLabeledReplicas {
 			return fmt.Errorf("Not enough pods running. Expected %s, got %s.", rc.Status.Replicas, rc.Status.FullyLabeledReplicas)
 		}
+
+		if svc.Spec.Ports[0].NodePort != 30000 {
+			return fmt.Errorf("Dashboard is not exposed on port {}", svc.Spec.Ports[0].NodePort)
+		}
+
 		return nil
 	}