Merge pull request #1830 from markturansky/label_validation

add RFC952 validation to labels
2014-10-27 09:54:18 -07:00
parent 80c1464a4a e2365b1f96
commit 37ffb41b81
4 changed files with 91 additions and 4 deletions
--- a/pkg/controller/replication_controller.go
+++ b/pkg/controller/replication_controller.go
@@ -57,8 +57,6 @@ func (r RealPodControl) createReplica(namespace string, controllerSpec api.Repli
 	for k, v := range controllerSpec.DesiredState.PodTemplate.Labels {
 		desiredLabels[k] = v
 	}
-	desiredLabels["replicationController"] = controllerSpec.Name
-
 	pod := &api.Pod{
 		ObjectMeta: api.ObjectMeta{
 			Labels: desiredLabels,