Merge pull request #16 from snorwin/namespace-to-cluster-scope-issue

Explicitly set an empty slice for cluster scoped instances
snorwin · Jun 18, 2021 · e4f4d0b · e4f4d0b
2 parents 6fd2020 + 581a132
commit e4f4d0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/controllers/argocd/argocd_controller.go b/controllers/argocd/argocd_controller.go
@@ -219,6 +219,8 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		sort.Strings(slice)
 
 		values["namespaces"] = slice
+	} else {
+		values["namespaces"] = []string{}
 	}
 
 	// only run helm upgrade if changes are needed

diff --git a/controllers/argocd/argocd_controller_test.go b/controllers/argocd/argocd_controller_test.go
@@ -571,7 +571,7 @@ var _ = Describe("Reconciler", func() {
 
 			mockHelm.
 				EXPECT().
-				Upgrade(argocd.Name, gomock.Any(), Values("namespaces", nil), true).
+				Upgrade(argocd.Name, gomock.Any(), Values("namespaces", []string{}), true).
 				Return(nil)
 
 			testReconcile(mockHelm, argocd)