Skip to content

fix: 'argocd admin settings rbac can' - yaml loading problem (#19403) #19575

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

Merged
jannfis merged 1 commit into from
Aug 18, 2024
Merged

fix: 'argocd admin settings rbac can' - yaml loading problem (#19403) #19575

Show file tree
Hide file tree
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
8 changes: 2 additions & 6 deletions cmd/argocd/commands/admin/settings_rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,20 +359,16 @@ func getPolicyFromFile(policyFile string) (string, string, string, error) {
// Retrieve policy information from a ConfigMap
func getPolicyFromConfigMap(cm *corev1.ConfigMap) (string, string, string) {
var (
userPolicy string
defaultRole string
ok bool
)
userPolicy, ok = cm.Data[rbac.ConfigMapPolicyCSVKey]
if !ok {
userPolicy = ""
}

defaultRole, ok = cm.Data[rbac.ConfigMapPolicyDefaultKey]
if !ok {
defaultRole = ""
}

return userPolicy, defaultRole, cm.Data[rbac.ConfigMapMatchModeKey]
return rbac.PolicyCSV(cm.Data), defaultRole, cm.Data[rbac.ConfigMapMatchModeKey]
}

// getPolicyConfigMap fetches the RBAC config map from K8s cluster
Expand Down
2 changes: 2 additions & 0 deletions cmd/argocd/commands/admin/settings_rbac_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ func Test_PolicyFromYAML(t *testing.T) {
require.NotEmpty(t, uPol)
require.Equal(t, "role:unknown", dRole)
require.Empty(t, matchMode)
require.True(t, checkPolicy("my-org:team-qa", "update", "project", "foo",
"", uPol, dRole, matchMode, true))
}

func Test_PolicyFromK8s(t *testing.T) {
Expand Down
4 changes: 4 additions & 0 deletions cmd/argocd/commands/admin/testdata/rbac/argocd-rbac-cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ data:
p, role:user, applicationsets, delete, */*, allow
p, role:user, logs, get, */*, allow
g, test, role:user
policy.overlay.csv: |
p, role:tester, applications, *, */*, allow
p, role:tester, projects, *, *, allow
g, my-org:team-qa, role:tester
policy.default: role:unknown
kind: ConfigMap
metadata:
Expand Down