From 59cbca0da3519bb9f9ad74630bbf34a5978418fd Mon Sep 17 00:00:00 2001 From: Wei-Xiang Sun Date: Wed, 29 Jun 2022 10:51:15 +0800 Subject: [PATCH] do not copy labels/annotations/finalizers to canary deployment (#50) Signed-off-by: mingzhou.swx Co-authored-by: mingzhou.swx --- .../workloads/deployment_double_controller.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkg/controller/batchrelease/workloads/deployment_double_controller.go b/pkg/controller/batchrelease/workloads/deployment_double_controller.go index aec662b..e0c7940 100644 --- a/pkg/controller/batchrelease/workloads/deployment_double_controller.go +++ b/pkg/controller/batchrelease/workloads/deployment_double_controller.go @@ -105,20 +105,8 @@ func (c *deploymentController) createCanaryDeployment(stableDeploy *apps.Deploym Annotations: map[string]string{}, }, } - for k, v := range stableDeploy.Labels { - canaryDeploy.Labels[k] = v - } - for k, v := range stableDeploy.Annotations { - canaryDeploy.Annotations[k] = v - } - for _, f := range stableDeploy.Finalizers { - canaryDeploy.Finalizers = append(canaryDeploy.Finalizers, f) - } - for _, o := range stableDeploy.OwnerReferences { - canaryDeploy.OwnerReferences = append(canaryDeploy.OwnerReferences, *o.DeepCopy()) - } - canaryDeploy.Finalizers = append(canaryDeploy.Finalizers, util.CanaryDeploymentFinalizer) + // set its owner to BatchRelease canaryDeploy.OwnerReferences = append(canaryDeploy.OwnerReferences, *metav1.NewControllerRef(c.parentController, c.parentController.GroupVersionKind())) // set extra labels & annotations