Do not apply label with version to fix upgrade issues (#617)

kudobuilder · Jul 22, 2019 · 3c1b9e9 · 3c1b9e9
1 parent c7b29e7
commit 3c1b9e9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/pkg/controller/planexecution/planexecution_controller.go b/pkg/controller/planexecution/planexecution_controller.go
@@ -385,14 +385,14 @@ 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{
 							"planexecution": planExecution.Name,
 							"plan":          planExecution.Spec.PlanName,
 							"phase":         phase.Name,
 							"step":          step.Name,
+							"version":       operatorVersion.Spec.Version,
 						},
 						GeneratorOptions: &ktypes.GeneratorOptions{
 							DisableNameSuffixHash: true,

diff --git a/pkg/test/test_data/patch/00-assert.yaml b/pkg/test/test_data/patch/00-assert.yaml
@@ -4,7 +4,6 @@ metadata:
   name: toy1-nginx-deployment
   labels:
     app: "toy"
-    version: "1.0.0"
     instance: "toy1"
   annotations:
     plan: "deploy"

diff --git a/pkg/test/test_data/patch/01-assert.yaml b/pkg/test/test_data/patch/01-assert.yaml
@@ -4,7 +4,6 @@ metadata:
   name: toy1-nginx-deployment
   labels:
     app: "toy"
-    version: "1.0.0"
     instance: "toy1"
   annotations:
     plan: "scale"