Skip to content

add ginkgo testing for Enable ApplicationFineGrainedRBACInheritance by default #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add ginkgo testing for Enable ApplicationFineGrainedRBACInheritance by default #916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion test/openshift/e2e/ginkgo/parallel/1-062_validate_extra_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,21 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {

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

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

By("verifying that extraConfig setting overrides CR field")
Eventually(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("admin.enabled", "true"))
Consistently(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("admin.enabled", "true"))
Eventually(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("server.rbac.disableApplicationFineGrainedRBACInheritance", "true"))
Consistently(argocdConfigMap).Should(configmapFixture.HaveStringDataKeyValue("server.rbac.disableApplicationFineGrainedRBACInheritance", "true"))

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