Merge branch 'argoproj-labs:master' into agent-service

Author: jparsai

controllers/argocd/rolebinding.go

@@ -342,7 +342,7 @@ func newRoleBindingWithNameForApplicationSourceNamespaces(namespace string, cr *
 	roleBinding := newRoleBindingForSupportNamespaces(cr, namespace)
 
 	labels := roleBinding.Labels
-	labels[common.ArgoCDKeyName] = roleBinding.Name
+	labels[common.ArgoCDKeyName] = cr.Name
 	roleBinding.Labels = labels
 
 	return roleBinding

controllers/argocd/rolebinding_test.go

@@ -477,3 +477,9 @@ func TestTruncateWithHashUniqueness(t *testing.T) {
 		assert.LessOrEqual(t, len(result), maxLabelLength, "Result should not exceed maxLabelLength")
 	}
 }
+
+func Test_newRoleBindingWithNameForApplicationSourceNamespaces(t *testing.T) {
+	cr := makeTestArgoCD()
+	roleBinding := newRoleBindingWithNameForApplicationSourceNamespaces("test", cr)
+	assert.Equal(t, roleBinding.Labels["app.kubernetes.io/name"], "argocd")
+}