Revert "Add app label to the pods"

This reverts commit bb06252.

CHANGELOG.md

@@ -4,7 +4,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [NEXT_RELEASE]
 ### Changed
-- [server] Add app label to the pods
 - [server] Always return `fallback` cloudprovider operations for unknown cloud providers
 
 ### Fixed

pkg/server/spec/cronjob.go

@@ -27,7 +27,6 @@ func NewCronJob(description, slugURL, schedule string, imgs *Images, a *app.App,
 			"SLUG_URL": slugURL,
 			"SLUG_DIR": slugVolumeMountPath,
 		},
-		Labels{},
 		fs,
 	)
 	ps.Containers[0].Args = args

pkg/server/spec/deploy.go

@@ -85,9 +85,9 @@ func NewDeploy(imgs *Images, description, slugURL string, rhl int, a *app.App, t
 			"SLUG_URL": slugURL,
 			"SLUG_DIR": slugVolumeMountPath,
 		},
-		Labels{"run": a.Name, "app": a.Name},
 		fs,
 	)
+	ps.Labels["run"] = a.Name
 	ps.Containers[0].Args = []string{"start", a.ProcessType}
 	ps.Containers[0].VolumeMounts = append(ps.Containers[0].VolumeMounts, newSlugVolumeMount())
 

pkg/server/spec/pod.go

@@ -71,14 +71,14 @@ func newPodContainers(name, nginxImage, appImage string, envVars map[string]stri
 	return c
 }
 
-func NewPod(name, nginxImage, image string, a *app.App, envVars map[string]string, labels Labels, fs storage.Storage) *Pod {
+func NewPod(name, nginxImage, image string, a *app.App, envVars map[string]string, fs storage.Storage) *Pod {
 	hasNginx := nginxImage != ""
 	ps := &Pod{
 		Name:       name,
 		Namespace:  a.Name,
 		Containers: newPodContainers(name, nginxImage, image, envVars, a.Secrets),
 		Volumes:    newPodVolumes(a.Name, fs, hasNginx),
-		Labels:     labels,
+		Labels:     make(map[string]string),
 	}
 
 	for _, e := range a.EnvVars {
@@ -103,7 +103,6 @@ func NewBuilder(name, tarBallLocation, buildDest, image string, a *app.App, fs s
 			"PUT_PATH":        buildDest,
 			"BUILDER_STORAGE": fs.Type(),
 		},
-		Labels{},
 		fs,
 	)
 	ps.Containers[0].VolumeMounts = []*VolumeMounts{newStorageKeyVolumeMount()}
@@ -122,7 +121,6 @@ func NewRunner(name, slugURL string, imgs *Images, a *app.App, fs storage.Storag
 			"SLUG_URL": slugURL,
 			"SLUG_DIR": slugVolumeMountPath,
 		},
-		Labels{},
 		fs,
 	)
 	ps.Containers[0].Args = command

pkg/server/spec/pod_test.go

@@ -20,7 +20,7 @@ func TestNewPodSpec(t *testing.T) {
 	expectedName := "test"
 	expectedImage := "docker/teresa-test:0.0.1"
 
-	ps := NewPod(expectedName, "nginx", expectedImage, a, ev, Labels{}, storage.NewFake())
+	ps := NewPod(expectedName, "nginx", expectedImage, a, ev, storage.NewFake())
 	if ps.Name != expectedName {
 		t.Errorf("expected %s, got %s", expectedName, ps.Name)
 	}