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

Jump to bottom

audit: update as of 2021-03-03 #1748

Merged
merged 1 commit into from
Mar 3, 2021
Merged

audit: update as of 2021-03-03 #1748

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
63 changes: 50 additions & 13 deletions audit/org_kubernetes.io/iam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,23 @@
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
Comment on lines +11 to +12
Copy link
Member

Choose a reason for hiding this comment

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

This was #1726 (as well as all other changes in this file unless I comment otherwise)

specifically the part where I was paranoid about accidentally locking out k8s-infra-gcp-org-admins@ when I consolidate their roles into a single custom role

these will be removed by deployment of #1737

],
"role": "organizations/758905017065/roles/StorageBucketLister"
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
],
"role": "organizations/758905017065/roles/audit.viewer"
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io"
],
"role": "organizations/758905017065/roles/organization.admin"
},
{
"members": [
"user:ihor@cncf.io",
Expand All @@ -27,37 +40,49 @@
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/billing.user"
},
{
"members": [
"group:gke-security-groups@kubernetes.io"
"group:k8s-infra-gcp-accounting@kubernetes.io"
],
"role": "roles/billing.viewer"
},
{
"members": [
"group:gke-security-groups@kubernetes.io",
"group:k8s-infra-prow-oncall@kubernetes.io"
],
"role": "roles/browser"
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/compute.viewer"
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/dns.reader"
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/iam.organizationRoleAdmin"
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/iam.securityReviewer"
},
Expand All @@ -69,9 +94,10 @@
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io",
"user:davanum@gmail.com",
"user:domain-admin-lf@kubernetes.io",
"user:ihor@cncf.io",
"user:psharma@linuxfoundation.org",
Copy link
Member

Choose a reason for hiding this comment

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

this was not me

I would suggest LF use our groups, but we're also in here as backup "just in case" so I don't really mind

"user:spiffxp@google.com",
"user:thockin@google.com",
"user:twaggoner@linuxfoundation.org"
Expand All @@ -80,31 +106,42 @@
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/resourcemanager.organizationViewer"
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/resourcemanager.projectCreator"
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/resourcemanager.projectDeleter"
},
{
"members": [
"group:k8s-infra-gcp-org-admins@kubernetes.io"
"group:k8s-infra-gcp-auditors@kubernetes.io"
],
"role": "roles/secretmanager.viewer"
},
{
"members": [
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/servicemanagement.quotaAdmin"
},
{
"members": [
"group:k8s-infra-gcp-auditors@kubernetes.io"
"user:davanum@gmail.com",
"user:thockin@google.com"
],
"role": "roles/serviceusage.serviceUsageConsumer"
}
Expand Down
2 changes: 1 addition & 1 deletion audit/org_kubernetes.io/roles/CustomRole.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Can view billing info",
"description": "View access to billing info",
Copy link
Member

Choose a reason for hiding this comment

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

role changes are also #1726 unless commented others

Copy link
Member

Choose a reason for hiding this comment

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

oops I changed the description of this a bit, should be fine?

I still don't understand the exact nature of why this role has the permissions it does, I've commented as much in its spec https://github.com/kubernetes/k8s.io/blob/986809ca3832cc0432732b7f183f6354f608287e/infra/gcp/roles/specs/CustomRole.yaml

"includedPermissions": [
"billing.accounts.getSpendingInformation",
"billing.budgets.get",
Expand Down
9 changes: 0 additions & 9 deletions audit/org_kubernetes.io/roles/StorageBucketLister.json
View file
Open in desktop

This file was deleted.

Loading