Merge pull request #90 from thedadams/allow-subctx-change-no-owner

Allow a subcontext change if no owner was set previously
acorn-io · Jul 7, 2023 · 5d519d2 · 5d519d2
2 parents 3f68234 + ad626dd
commit 5d519d2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/apply/desiredset_process.go b/pkg/apply/desiredset_process.go
@@ -278,9 +278,9 @@ func isAllowOwnerTransition(existingObj, newObj kclient.Object) bool {
 	existingAnno := existingObj.GetAnnotations()
 	newAnno := newObj.GetAnnotations()
 	return newAnno[LabelSubContext] != "" &&
-		existingAnno[LabelGVK] == newAnno[LabelGVK] &&
-		existingAnno[LabelNamespace] == newAnno[LabelNamespace] &&
-		existingAnno[LabelName] == newAnno[LabelName] &&
+		(existingAnno[LabelGVK] == "" || existingAnno[LabelGVK] == newAnno[LabelGVK]) &&
+		(existingAnno[LabelNamespace] == "" || existingAnno[LabelNamespace] == newAnno[LabelNamespace]) &&
+		(existingAnno[LabelName] == "" || existingAnno[LabelName] == newAnno[LabelName]) &&
 		validOwnerChange[fmt.Sprintf("%s => %s", existingAnno[LabelSubContext], newAnno[LabelSubContext])]
 
 }