Merge pull request #33604 from elsonrodriguez/spark-update

examples/examples_test.go

@@ -291,13 +291,14 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"rc":             &api.ReplicationController{},
 		},
 		"../examples/spark": {
-			"namespace-spark-cluster": &api.Namespace{},
-			"spark-master-controller": &api.ReplicationController{},
-			"spark-master-service":    &api.Service{},
-			"spark-webui":             &api.Service{},
-			"spark-worker-controller": &api.ReplicationController{},
-			"zeppelin-controller":     &api.ReplicationController{},
-			"zeppelin-service":        &api.Service{},
+			"namespace-spark-cluster":   &api.Namespace{},
+			"spark-master-controller":   &api.ReplicationController{},
+			"spark-master-service":      &api.Service{},
+			"spark-ui-proxy-controller": &api.ReplicationController{},
+			"spark-ui-proxy-service":    &api.Service{},
+			"spark-worker-controller":   &api.ReplicationController{},
+			"zeppelin-controller":       &api.ReplicationController{},
+			"zeppelin-service":          &api.Service{},
 		},
 		"../examples/spark/spark-gluster": {
 			"spark-master-service":    &api.Service{},

examples/spark/spark-master-controller.yaml

@@ -2,6 +2,7 @@ kind: ReplicationController
 apiVersion: v1
 metadata:
   name: spark-master-controller
+  namespace: spark-cluster
 spec:
   replicas: 1
   selector:

examples/spark/spark-master-service.yaml

@@ -2,9 +2,14 @@ kind: Service
 apiVersion: v1
 metadata:
   name: spark-master
+  namespace: spark-cluster
 spec:
   ports:
     - port: 7077
       targetPort: 7077
+      name: spark
+    - port: 8080
+      targetPort: 8080
+      name: http
   selector:
     component: spark-master

examples/spark/spark-ui-proxy-controller.yaml

+kind: ReplicationController
+apiVersion: v1
+metadata:
+  name: spark-ui-proxy-controller
+  namespace: spark-cluster
+spec:
+  replicas: 1
+  selector:
+    component: spark-ui-proxy
+  template:
+    metadata:
+      labels:
+        component: spark-ui-proxy
+    spec:
+      containers:
+        - name: spark-ui-proxy
+          image: elsonrodriguez/spark-ui-proxy:1.0
+          ports:
+            - containerPort: 80
+          resources:
+            requests:
+              cpu: 100m
+          args:
+            - spark-master:8080
+          livenessProbe:
+              httpGet:
+                path: /
+                port: 80
+              initialDelaySeconds: 120
+              timeoutSeconds: 5

examples/spark/spark-webui.yaml → examples/spark/spark-ui-proxy-service.yaml

 kind: Service
 apiVersion: v1
 metadata:
-  name: spark-webui
+  name: spark-ui-proxy
   namespace: spark-cluster
 spec:
   ports:
-    - port: 8080
-      targetPort: 8080
+    - port: 80
+      targetPort: 80
   selector:
-    component: spark-master
+    component: spark-ui-proxy
+  type: LoadBalancer

examples/spark/spark-worker-controller.yaml

@@ -2,6 +2,7 @@ kind: ReplicationController
 apiVersion: v1
 metadata:
   name: spark-worker-controller
+  namespace: spark-cluster
 spec:
   replicas: 2
   selector:

examples/spark/zeppelin-service.yaml

@@ -5,7 +5,8 @@ metadata:
   namespace: spark-cluster
 spec:
   ports:
-    - port: 8080
+    - port: 80
       targetPort: 8080
   selector:
     component: zeppelin
+  type: LoadBalancer