Skip to content

Commit 32e7795

Browse files
committed
add ginkgo testing for Enable ApplicationFineGrainedRBACInheritance by default (GITOPS-6889)
Signed-off-by: nmirasch <[email protected]>
1 parent 46c43ce commit 32e7795

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

test/openshift/e2e/ginkgo/parallel/1-062_validate_extra_config_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,21 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
6969

7070
By("verifying ConfigMap picks up admin.enabled setting from ArgoCD CR")
7171
Eventually(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("admin.enabled", "true"))
72+
Consistently(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("server.rbac.disableApplicationFineGrainedRBACInheritance", "false"))
7273

7374
By("disabling admin via CR spec, but enabling via extra config")
7475
argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
7576
ac.Spec.DisableAdmin = true
76-
ac.Spec.ExtraConfig = map[string]string{"admin.enabled": "true"} // override admin user through extraConfig
77+
ac.Spec.ExtraConfig = map[string]string{
78+
"admin.enabled": "true", // override admin user through extraConfig
79+
"server.rbac.disableApplicationFineGrainedRBACInheritance": "true"}
7780
})
7881

7982
By("verifying that extraConfig setting overrides CR field")
8083
Eventually(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("admin.enabled", "true"))
8184
Consistently(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("admin.enabled", "true"))
85+
Eventually(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("server.rbac.disableApplicationFineGrainedRBACInheritance", "true"))
86+
Consistently(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("server.rbac.disableApplicationFineGrainedRBACInheritance", "true"))
8287

8388
By("simulating the user manually modifying the ConfigMap without doing so via the ArgoCD CR")
8489
configmapFixture.Update(argocdConfigMap, func(cm *corev1.ConfigMap) {

0 commit comments

Comments
 (0)