Merge pull request kubeflow#448 from liyinan926/master

Also add a label for the submission ID to other resources
amolde · Mar 21, 2019 · 4b4335d · 4b4335d
2 parents 1bbf0d0 + e362d4c
commit 4b4335d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/controller/sparkapplication/sparkui.go b/pkg/controller/sparkapplication/sparkui.go
@@ -65,6 +65,7 @@ func createSparkUIIngress(app *v1beta1.SparkApplication, service SparkService, i
 			Namespace: app.Namespace,
 			Labels: map[string]string{
 				config.SparkAppNameLabel: app.Name,
+				config.SubmissionIDLabel: app.Status.SubmissionID,
 			},
 			OwnerReferences: []metav1.OwnerReference{*getOwnerReference(app)},
 		},
@@ -114,6 +115,7 @@ func createSparkUIService(
 			Namespace: app.Namespace,
 			Labels: map[string]string{
 				config.SparkAppNameLabel: app.Name,
+				config.SubmissionIDLabel: app.Status.SubmissionID,
 			},
 			OwnerReferences: []metav1.OwnerReference{*getOwnerReference(app)},
 		},

diff --git a/pkg/controller/sparkapplication/sparkui_test.go b/pkg/controller/sparkapplication/sparkui_test.go
@@ -61,8 +61,7 @@ func TestCreateSparkUIService(t *testing.T) {
 			}
 			t.Fatal(err)
 		}
-		if len(service.Labels) != 1 ||
-			service.Labels[config.SparkAppNameLabel] != test.app.Name {
+		if service.Labels[config.SparkAppNameLabel] != test.app.Name {
 			t.Errorf("%s: service of app %s has the wrong labels", test.name, test.app.Name)
 		}
 		if !reflect.DeepEqual(test.expectedSelector, service.Spec.Selector) {
@@ -210,8 +209,7 @@ func TestCreateSparkUIIngress(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if len(ingress.Labels) != 1 ||
-		ingress.Labels[config.SparkAppNameLabel] != app.Name {
+	if ingress.Labels[config.SparkAppNameLabel] != app.Name {
 		t.Errorf("Ingress of app %s has the wrong labels", app.Name)
 	}