add RFC952 label validation

2014-10-23 16:14:13 -04:00
parent 15008e1390
commit e2365b1f96
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(ctx api.Context, controllerSpec api.Replic
 	for k, v := range controllerSpec.DesiredState.PodTemplate.Labels {
 		desiredLabels[k] = v
 	}
-	desiredLabels["replicationController"] = controllerSpec.Name
-
 	pod := &api.Pod{
 		ObjectMeta: api.ObjectMeta{
 			Labels: desiredLabels,