Skip to content
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

Make it possible to allow collaborator admin access in pet clusters #2877

Merged
merged 1 commit into from
Jan 20, 2020
Merged

Make it possible to allow collaborator admin access in pet clusters #2877

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
7 changes: 7 additions & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ custom_dns_zone_nameservers: "" # space seperated list of nameserver IP addresse
# prefix prepended to ownership TXT records for external-dns
external_dns_ownership_prefix: ""

# special roles for test/pet clusters
{{if eq .Cluster.Environment "e2e"}}
collaborator_administrator_access: "true"
{{else}}
collaborator_administrator_access: "false"
{{end}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the logic not reversed here? Should be true in case of e2e?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops.


# enable legacy serviceaccounts for smooth RBAC migration
enable_operator_sa: "false"
enable_default_sa: "false"
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/userdata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ write_files:
- --derived-role=CollaboratorManual=Collaborator24x7,Manual
{{- else if eq .Cluster.Environment "test"}}
- --role-mapping=CollaboratorPowerUser=cn=Deployer,ou=collaborators,ou=Kubernetes,ou=apps,dc=zalando,dc=net
{{- else if eq .Cluster.Environment "e2e"}}
{{- else if eq .Cluster.ConfigItems.collaborator_administrator_access "true"}}
- --role-mapping=Administrator=cn=Contributor,ou=collaborators,ou=Kubernetes,ou=apps,dc=zalando,dc=net
{{- end}}

Expand Down