@@ -69,16 +69,21 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
69
69
70
70
By ("verifying ConfigMap picks up admin.enabled setting from ArgoCD CR" )
71
71
Eventually (argocdConfigMap ).Should (configmapFixture .HaveStringDataKeyValue ("admin.enabled" , "true" ))
72
+ Consistently (argocdConfigMap ).Should (configmapFixture .HaveStringDataKeyValue ("server.rbac.disableApplicationFineGrainedRBACInheritance" , "false" ))
72
73
73
74
By ("disabling admin via CR spec, but enabling via extra config" )
74
75
argocdFixture .Update (argoCD , func (ac * argov1beta1api.ArgoCD ) {
75
76
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" }
77
80
})
78
81
79
82
By ("verifying that extraConfig setting overrides CR field" )
80
83
Eventually (argocdConfigMap ).Should (configmapFixture .HaveStringDataKeyValue ("admin.enabled" , "true" ))
81
84
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" ))
82
87
83
88
By ("simulating the user manually modifying the ConfigMap without doing so via the ArgoCD CR" )
84
89
configmapFixture .Update (argocdConfigMap , func (cm * corev1.ConfigMap ) {
0 commit comments