Set explicit labels/selector for apps/v1 Deployment/RS.

pkg/controller/deployment/sync.go

@@ -195,6 +195,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *apps.Deployment, rsList, old
 			Name:            d.Name + "-" + rand.SafeEncodeString(podTemplateSpecHash),
 			Namespace:       d.Namespace,
 			OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(d, controllerKind)},
+			Labels:          newRSTemplate.Labels,
 		},
 		Spec: apps.ReplicaSetSpec{
 			Replicas:        new(int32),

test/e2e/apimachinery/aggregator.go

@@ -173,10 +173,14 @@ func TestSampleAPIServer(f *framework.Framework, image string) {
 	}
 	d := &apps.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: deploymentName,
+			Name:   deploymentName,
+			Labels: podLabels,
 		},
 		Spec: apps.DeploymentSpec{
 			Replicas: &replicas,
+			Selector: &metav1.LabelSelector{
+				MatchLabels: podLabels,
+			},
 			Strategy: apps.DeploymentStrategy{
 				Type: apps.RollingUpdateDeploymentStrategyType,
 			},

test/e2e/apimachinery/webhook.go

@@ -265,10 +265,14 @@ func deployWebhookAndService(f *framework.Framework, image string, context *cert
 	}
 	d := &apps.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: deploymentName,
+			Name:   deploymentName,
+			Labels: podLabels,
 		},
 		Spec: apps.DeploymentSpec{
 			Replicas: &replicas,
+			Selector: &metav1.LabelSelector{
+				MatchLabels: podLabels,
+			},
 			Strategy: apps.DeploymentStrategy{
 				Type: apps.RollingUpdateDeploymentStrategyType,
 			},

test/e2e/apps/replica_set.go

@@ -40,7 +40,8 @@ func newRS(rsName string, replicas int32, rsPodLabels map[string]string, imageNa
 	zero := int64(0)
 	return &apps.ReplicaSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: rsName,
+			Name:   rsName,
+			Labels: rsPodLabels,
 		},
 		Spec: apps.ReplicaSetSpec{
 			Selector: &metav1.LabelSelector{

test/e2e/framework/deployment_util.go

@@ -87,7 +87,8 @@ func NewDeployment(deploymentName string, replicas int32, podLabels map[string]s
 	zero := int64(0)
 	return &apps.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: deploymentName,
+			Name:   deploymentName,
+			Labels: podLabels,
 		},
 		Spec: apps.DeploymentSpec{
 			Replicas: &replicas,