diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index a49938bba9b..9ddb6d453f6 100644 --- a/pkg/controller/deployment/sync.go +++ b/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), diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index bd3a674de0c..a1139655e41 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/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, }, diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go index 2e3582a1afe..f5647aa989e 100644 --- a/test/e2e/apimachinery/webhook.go +++ b/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, }, diff --git a/test/e2e/apps/replica_set.go b/test/e2e/apps/replica_set.go index a8c23ea7401..354d2e94b74 100644 --- a/test/e2e/apps/replica_set.go +++ b/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{ diff --git a/test/e2e/framework/deployment_util.go b/test/e2e/framework/deployment_util.go index 89695d28d6c..62162432816 100644 --- a/test/e2e/framework/deployment_util.go +++ b/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,