Merge pull request #160 from thetechnick/hotfix-reconcile-loop

Fix reconcile loop, due to fighting with OLM about namespace labels
openshift · Mar 11, 2022 · 6a124f7 · 6a124f7
2 parents 3bf5dbb + fa1ed4c
commit 6a124f7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/internal/controllers/addon/phase_ensure_wanted_namespaces.go b/internal/controllers/addon/phase_ensure_wanted_namespaces.go
@@ -93,8 +93,10 @@ func reconcileNamespace(ctx context.Context, c client.Client,
 		return nil, controllers.ErrNotOwnedByUs
 	}
 
+	for k, v := range namespace.Labels {
+		currentNamespace.Labels[k] = v
+	}
 	currentNamespace.OwnerReferences = namespace.OwnerReferences
-	currentNamespace.Labels = namespace.Labels
 
 	return currentNamespace, c.Update(ctx, currentNamespace)
 }