Merge pull request #2010 from spiffxp/update-roles

infra/gcp/roles: update custom org roles
kubernetes · May 6, 2021 · a6bbfbd · a6bbfbd
2 parents 0fb263f + ebece4e
commit a6bbfbd
Show file tree

Hide file tree

Showing 8 changed files with 244 additions and 13 deletions.
diff --git a/groups/groups.yaml b/groups/groups.yaml
@@ -250,7 +250,6 @@ groups:
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
 
   #
   # Push groups: k8s-infra-push-*

diff --git a/groups/wg-k8s-infra/groups.yaml b/groups/wg-k8s-infra/groups.yaml
@@ -126,7 +126,6 @@ groups:
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]

diff --git a/infra/gcp/ensure-organization.sh b/infra/gcp/ensure-organization.sh
@@ -52,6 +52,9 @@ org_role_bindings=(
   # https://cloud.google.com/storage/docs/access-control/iam-roles#basic-roles-intrinsic
   "group:[email protected]:roles/owner"
   "group:[email protected]:$(custom_org_role_name "organization.admin")"
+  # orgpolicy.policy.set is not allowed in custom roles, this is the only role that has it
+  "group:[email protected]:roles/orgpolicy.policyAdmin"
+
 
   # empower k8s-infra-prow-oncall@ to use GCP Console to navigate to their projects
   "group:[email protected]:roles/browser"

diff --git a/infra/gcp/roles/audit.viewer.yaml b/infra/gcp/roles/audit.viewer.yaml
@@ -7,15 +7,33 @@
 # name: audit.viewer
 # include:
 #   roles:
+#   # TODO: consider using roles/viewer instead of per-service?
+#   # view/read-only roles for specific services of interest
+#   # read access to compute
 #   - roles/compute.viewer
+#   # read access to dns
 #   - roles/dns.reader
+#   # read access to cloud assets metadata
+#   - roles/cloudasset.viewer
+# 
+#   # meta roles (regardless of roles/viewer)
+#   # read access for the project hierarchy (org, folders, projects)
+#   - roles/browser
+#   # list all resources and their IAM policies
 #   - roles/iam.securityReviewer
-#   - roles/resourcemanager.organizationViewer
+#   # TODO: what specifically needs serviceusage.services.use?
+#   #       could we use roles/serviceusage.serviceUsageViewer instead?
 #   - roles/serviceusage.serviceUsageConsumer
 #   permissions:
+#   # for gsutil _ get: cors, iam, label, logging, lifecycle, retention, ubla
 #   - storage.buckets.get
-#   - storage.buckets.getIamPolicy
-#   - storage.buckets.list
+#   permissionRegexes:
+#   # restrict to get|list calls...
+#   - \.(list|get)[^\.]*$
+#   # ...except for specific services of interest mentioned above
+#   - ^(compute|cloudasset)\.
+#   # ...and this specific permission from roles/serviceusage.serviceUsageConsumer
+#   - serviceusage.services.use
 # exclude:
 #   permissionRegexes:
 #   # permissions with custom roles support level NOT_SUPPORTED
@@ -173,6 +191,100 @@ includedPermissions:
   - binaryauthorization.policy.getIamPolicy
   - clientauthconfig.brands.list
   - clientauthconfig.clients.list
+  - cloudasset.assets.analyzeIamPolicy
+  - cloudasset.assets.exportAccessLevel
+  - cloudasset.assets.exportAccessPolicy
+  - cloudasset.assets.exportAllAccessPolicy
+  - cloudasset.assets.exportAppengineApplications
+  - cloudasset.assets.exportAppengineServices
+  - cloudasset.assets.exportAppengineVersions
+  - cloudasset.assets.exportBigqueryDatasets
+  - cloudasset.assets.exportBigqueryTables
+  - cloudasset.assets.exportBigtableCluster
+  - cloudasset.assets.exportBigtableInstance
+  - cloudasset.assets.exportBigtableTable
+  - cloudasset.assets.exportCloudbillingBillingAccounts
+  - cloudasset.assets.exportCloudkmsCryptoKeyVersions
+  - cloudasset.assets.exportCloudkmsCryptoKeys
+  - cloudasset.assets.exportCloudkmsImportJobs
+  - cloudasset.assets.exportCloudkmsKeyRings
+  - cloudasset.assets.exportCloudresourcemanagerFolders
+  - cloudasset.assets.exportCloudresourcemanagerOrganizations
+  - cloudasset.assets.exportCloudresourcemanagerProjects
+  - cloudasset.assets.exportComputeAddress
+  - cloudasset.assets.exportComputeAutoscalers
+  - cloudasset.assets.exportComputeBackendBuckets
+  - cloudasset.assets.exportComputeBackendServices
+  - cloudasset.assets.exportComputeDisks
+  - cloudasset.assets.exportComputeFirewalls
+  - cloudasset.assets.exportComputeForwardingRules
+  - cloudasset.assets.exportComputeGlobalAddress
+  - cloudasset.assets.exportComputeGlobalForwardingRules
+  - cloudasset.assets.exportComputeHealthChecks
+  - cloudasset.assets.exportComputeHttpHealthChecks
+  - cloudasset.assets.exportComputeHttpsHealthChecks
+  - cloudasset.assets.exportComputeImages
+  - cloudasset.assets.exportComputeInstanceGroupManagers
+  - cloudasset.assets.exportComputeInstanceGroups
+  - cloudasset.assets.exportComputeInstanceTemplates
+  - cloudasset.assets.exportComputeInstances
+  - cloudasset.assets.exportComputeInterconnect
+  - cloudasset.assets.exportComputeInterconnectAttachment
+  - cloudasset.assets.exportComputeLicenses
+  - cloudasset.assets.exportComputeNetworks
+  - cloudasset.assets.exportComputeProjects
+  - cloudasset.assets.exportComputeRegionAutoscaler
+  - cloudasset.assets.exportComputeRegionBackendServices
+  - cloudasset.assets.exportComputeRegionDisk
+  - cloudasset.assets.exportComputeRegionInstanceGroup
+  - cloudasset.assets.exportComputeRegionInstanceGroupManager
+  - cloudasset.assets.exportComputeRouters
+  - cloudasset.assets.exportComputeRoutes
+  - cloudasset.assets.exportComputeSecurityPolicy
+  - cloudasset.assets.exportComputeSnapshots
+  - cloudasset.assets.exportComputeSslCertificates
+  - cloudasset.assets.exportComputeSubnetworks
+  - cloudasset.assets.exportComputeTargetHttpProxies
+  - cloudasset.assets.exportComputeTargetHttpsProxies
+  - cloudasset.assets.exportComputeTargetInstances
+  - cloudasset.assets.exportComputeTargetPools
+  - cloudasset.assets.exportComputeTargetSslProxies
+  - cloudasset.assets.exportComputeTargetTcpProxies
+  - cloudasset.assets.exportComputeTargetVpnGateways
+  - cloudasset.assets.exportComputeUrlMaps
+  - cloudasset.assets.exportComputeVpnTunnels
+  - cloudasset.assets.exportContainerClusterrole
+  - cloudasset.assets.exportContainerClusterrolebinding
+  - cloudasset.assets.exportContainerClusters
+  - cloudasset.assets.exportContainerNamespace
+  - cloudasset.assets.exportContainerNode
+  - cloudasset.assets.exportContainerNodepool
+  - cloudasset.assets.exportContainerPod
+  - cloudasset.assets.exportContainerRole
+  - cloudasset.assets.exportContainerRolebinding
+  - cloudasset.assets.exportContainerregistryImage
+  - cloudasset.assets.exportDatafusionInstance
+  - cloudasset.assets.exportDataprocClusters
+  - cloudasset.assets.exportDataprocJobs
+  - cloudasset.assets.exportDnsManagedZones
+  - cloudasset.assets.exportDnsPolicies
+  - cloudasset.assets.exportIamPolicy
+  - cloudasset.assets.exportIamRoles
+  - cloudasset.assets.exportIamServiceAccountKeys
+  - cloudasset.assets.exportIamServiceAccounts
+  - cloudasset.assets.exportManagedidentitiesDomain
+  - cloudasset.assets.exportOrgPolicy
+  - cloudasset.assets.exportPubsubSubscriptions
+  - cloudasset.assets.exportPubsubTopics
+  - cloudasset.assets.exportResource
+  - cloudasset.assets.exportServicePerimeter
+  - cloudasset.assets.exportServicemanagementServices
+  - cloudasset.assets.exportSpannerDatabases
+  - cloudasset.assets.exportSpannerInstances
+  - cloudasset.assets.exportSqladminInstances
+  - cloudasset.assets.exportStorageBuckets
+  - cloudasset.assets.searchAllIamPolicies
+  - cloudasset.assets.searchAllResources
   - cloudasset.feeds.list
   - cloudbuild.builds.list
   - clouddebugger.breakpoints.list
@@ -694,8 +806,6 @@ includedPermissions:
   - iap.webServiceVersions.getIamPolicy
   - iap.webServices.getIamPolicy
   - iap.webTypes.getIamPolicy
-  - identityplatform.workloadPoolProviders.list
-  - identityplatform.workloadPools.list
   - lifesciences.operations.list
   - logging.buckets.list
   - logging.exclusions.list
@@ -706,6 +816,7 @@ includedPermissions:
   - logging.logServices.list
   - logging.logs.list
   - logging.notificationRules.list
+  - logging.operations.list
   - logging.privateLogEntries.list
   - logging.queries.list
   - logging.sinks.list
@@ -745,6 +856,12 @@ includedPermissions:
   - monitoring.slos.list
   - monitoring.timeSeries.list
   - monitoring.uptimeCheckConfigs.list
+  - networkconnectivity.hubs.getIamPolicy
+  - networkconnectivity.hubs.list
+  - networkconnectivity.locations.list
+  - networkconnectivity.operations.list
+  - networkconnectivity.spokes.getIamPolicy
+  - networkconnectivity.spokes.list
   - networkmanagement.connectivitytests.getIamPolicy
   - networkmanagement.connectivitytests.list
   - networkmanagement.locations.list
@@ -773,19 +890,29 @@ includedPermissions:
   - notebooks.instances.list
   - notebooks.locations.list
   - notebooks.operations.list
+  - notebooks.runtimes.getIamPolicy
+  - notebooks.runtimes.list
   - notebooks.schedules.getIamPolicy
   - notebooks.schedules.list
   - ondemandscanning.operations.list
   - opsconfigmonitoring.resourceMetadata.list
   - osconfig.guestPolicies.list
+  - osconfig.instanceOSPoliciesCompliances.list
+  - osconfig.inventories.list
+  - osconfig.osPolicyAssignments.list
   - osconfig.patchDeployments.list
   - osconfig.patchJobs.list
+  - osconfig.vulnerabilityReports.list
   - policysimulator.replayResults.list
   - policysimulator.replays.list
+  - privateca.caPools.getIamPolicy
+  - privateca.caPools.list
   - privateca.certificateAuthorities.getIamPolicy
   - privateca.certificateAuthorities.list
   - privateca.certificateRevocationLists.getIamPolicy
   - privateca.certificateRevocationLists.list
+  - privateca.certificateTemplates.getIamPolicy
+  - privateca.certificateTemplates.list
   - privateca.certificates.getIamPolicy
   - privateca.certificates.list
   - privateca.locations.list
@@ -808,6 +935,10 @@ includedPermissions:
   - pubsublite.subscriptions.list
   - pubsublite.topics.list
   - recaptchaenterprise.keys.list
+  - recommender.cloudAssetInsights.get
+  - recommender.cloudAssetInsights.list
+  - recommender.cloudsqlInstanceDiskUsageTrendInsights.list
+  - recommender.cloudsqlInstanceOutOfDiskRecommendations.list
   - recommender.commitmentUtilizationInsights.list
   - recommender.computeAddressIdleResourceInsights.list
   - recommender.computeAddressIdleResourceRecommendations.list
@@ -822,6 +953,7 @@ includedPermissions:
   - recommender.iamPolicyInsights.list
   - recommender.iamPolicyRecommendations.list
   - recommender.iamServiceAccountInsights.list
+  - recommender.locations.get
   - recommender.locations.list
   - recommender.loggingProductSuggestionContainerInsights.list
   - recommender.loggingProductSuggestionContainerRecommendations.list
@@ -833,14 +965,15 @@ includedPermissions:
   - redis.operations.list
   - remotebuildexecution.instances.list
   - remotebuildexecution.workerpools.list
+  - resourcemanager.folders.get
   - resourcemanager.folders.getIamPolicy
   - resourcemanager.folders.list
+  - resourcemanager.hierarchyNodes.listTagBindings
   - resourcemanager.organizations.get
   - resourcemanager.organizations.getIamPolicy
   - resourcemanager.projects.get
   - resourcemanager.projects.getIamPolicy
   - resourcemanager.projects.list
-  - resourcemanager.resourceTagBindings.list
   - resourcemanager.tagKeys.getIamPolicy
   - resourcemanager.tagKeys.list
   - resourcemanager.tagValues.getIamPolicy
@@ -912,6 +1045,7 @@ includedPermissions:
   - storage.buckets.getIamPolicy
   - storage.buckets.list
   - storage.hmacKeys.list
+  - storage.multipartUploads.list
   - storage.objects.getIamPolicy
   - storage.objects.list
   - storagetransfer.jobs.list
@@ -923,7 +1057,18 @@ includedPermissions:
   - tpu.tensorflowversions.list
   - transcoder.jobTemplates.list
   - transcoder.jobs.list
+  - translationhub.portals.list
+  - vmmigration.cloneJobs.list
+  - vmmigration.cutoverJobs.list
+  - vmmigration.datacenterConnectors.list
   - vmmigration.deployments.list
+  - vmmigration.groups.list
+  - vmmigration.locations.list
+  - vmmigration.migratingVms.list
+  - vmmigration.operations.list
+  - vmmigration.sources.list
+  - vmmigration.targets.list
+  - vmmigration.utilizationReports.list
   - vpcaccess.connectors.list
   - vpcaccess.locations.list
   - vpcaccess.operations.list

diff --git a/infra/gcp/roles/generate-role-yaml.sh b/infra/gcp/roles/generate-role-yaml.sh
@@ -45,6 +45,13 @@
 #   generate-role-yaml.sh specs/foo.bar.yaml
 #   diff foo.yaml foo.bar.yaml
 #   gcloud iam roles create --project project-id foo.bar --file foo.bar.yaml
+#
+# Note it's possible to generate a custom role that is too large:
+#
+#   "The total size of the title, description, and permission names for a
+#    custom role is limited to 64 KB"
+#
+#   ref: https://cloud.google.com/iam/docs/creating-custom-roles
 
 set -o errexit
 set -o nounset
@@ -73,8 +80,9 @@ function output_role_yaml() {
   name=$(<"${spec}" yq -r .name)
   mapfile -t include_roles < <(<"${spec}" yq -r '.include? | .roles//[] | .[]')
   mapfile -t include_permissions < <(<"${spec}" yq -r '.include? | .permissions//[] | .[]')
-  include_regex=$(<"${spec}" yq -r '.include? | .permissionRegexes//[] | join("|")')
-  exclude_regex=$(<"${spec}" yq -r '.exclude? | .permissionRegexes//[] | join("|")')
+  # wrap regexes in their own groups
+  include_regex=$(<"${spec}" yq -r '.include? | .permissionRegexes//[] | map("(\(.))") | join("|")')
+  exclude_regex=$(<"${spec}" yq -r '.exclude? | .permissionRegexes//[] | map("(\(.))") | join("|")')
 
   local output_path="${output_dir}/${name}.yaml"
 

diff --git a/infra/gcp/roles/organization.admin.yaml b/infra/gcp/roles/organization.admin.yaml
@@ -8,19 +8,50 @@
 # name: organization.admin
 # include:
 #   roles:
+#   # specific billing permissions we need
+#   # TODO(spiffxp): should we just use billing.admin? or save this for GCP accounting group?
+#   # maybe for resourceAssociations.create
 #   - roles/billing.user
+#   # for billing.accounts.create (to create a budget for a project)
+#   - roles/billing.creator
+#   # maybe for budgets.*, this also offers accounts.updateUsageExportSpec
+#   - roles/billing.costsManager
+# 
+#   # resourcemanager.* permissions missing from roles/owner
+#   # for resourcemanager.folders.*
 #   - roles/resourcemanager.folderAdmin
+#   # for resourcemanager.organizations.*
 #   - roles/resourcemanager.organizationAdmin
+#   # for resourcemanager.projects.create
 #   - roles/resourcemanager.projectCreator
+# 
+#   # for storage.buckets.(get|update|(get|set)IamPolicy)
+#   - roles/storage.admin
+#   permissionRegexes:
+#   # to ensure storage.buckets.* is all we get from roles/storage.admin
+#   - ^billing.
+#   - ^orgpolicy.
+#   - ^resourcemanager.
+#   - ^storage.buckets.
 #
 description: Access to administer all resources belonging to the organization
 includedPermissions:
+  - billing.accounts.create
   - billing.accounts.get
   - billing.accounts.getIamPolicy
+  - billing.accounts.getSpendingInformation
+  - billing.accounts.getUsageExportSpec
   - billing.accounts.list
   - billing.accounts.redeemPromotion
+  - billing.accounts.updateUsageExportSpec
+  - billing.budgets.create
+  - billing.budgets.delete
+  - billing.budgets.get
+  - billing.budgets.list
+  - billing.budgets.update
   - billing.credits.list
   - billing.resourceAssociations.create
+  - billing.resourceAssociations.list
   - orgpolicy.policy.get
   - resourcemanager.folders.create
   - resourcemanager.folders.delete
@@ -40,6 +71,13 @@ includedPermissions:
   - resourcemanager.projects.list
   - resourcemanager.projects.move
   - resourcemanager.projects.setIamPolicy
+  - storage.buckets.create
+  - storage.buckets.delete
+  - storage.buckets.get
+  - storage.buckets.getIamPolicy
+  - storage.buckets.list
+  - storage.buckets.setIamPolicy
+  - storage.buckets.update
 name: organization.admin
 stage: GA
 title: Organization Admin