diff --git a/pkg/controller/planexecution/planexecution_controller.go b/pkg/controller/planexecution/planexecution_controller.go index 758f025ba..039353fb8 100644 --- a/pkg/controller/planexecution/planexecution_controller.go +++ b/pkg/controller/planexecution/planexecution_controller.go @@ -391,7 +391,6 @@ func (r *ReconcilePlanExecution) Reconcile(request reconcile.Request) (reconcile CommonLabels: map[string]string{ "heritage": "kudo", "app": operatorVersion.Spec.Operator.Name, - "version": operatorVersion.Spec.Version, "instance": instance.Name, }, CommonAnnotations: map[string]string{ @@ -399,6 +398,7 @@ func (r *ReconcilePlanExecution) Reconcile(request reconcile.Request) (reconcile "plan": planExecution.Spec.PlanName, "phase": phase.Name, "step": step.Name, + "version": operatorVersion.Spec.Version, }, GeneratorOptions: &ktypes.GeneratorOptions{ DisableNameSuffixHash: true, diff --git a/test/integration/patch/00-assert.yaml b/test/integration/patch/00-assert.yaml index 0830dc912..9bb11a4e0 100644 --- a/test/integration/patch/00-assert.yaml +++ b/test/integration/patch/00-assert.yaml @@ -4,7 +4,6 @@ metadata: name: toy1-my-service labels: app: "toy" - version: "1.0.0" instance: "toy1" annotations: plan: "deploy" diff --git a/test/integration/patch/01-assert.yaml b/test/integration/patch/01-assert.yaml index c6b184f84..cf4b8f7c9 100644 --- a/test/integration/patch/01-assert.yaml +++ b/test/integration/patch/01-assert.yaml @@ -4,7 +4,6 @@ metadata: name: toy1-my-service labels: app: "toy" - version: "1.0.0" instance: "toy1" annotations: plan: "scale"