Skip to content

Use dedicated service account, fix RBAC #998

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

Open
cPu1 wants to merge 1 commit into
base: spectro-master
Choose a base branch
from
Open

Use dedicated service account, fix RBAC #998

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
74 changes: 64 additions & 10 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ rules:
- get
- list
- watch
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- get
- list
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand Down Expand Up @@ -72,8 +80,8 @@ rules:
- clusters
- clusters/status
- machinedeployments
- machines
- machines/status
- machinesets
verbs:
- get
- list
Expand All @@ -84,10 +92,20 @@ rules:
- machinepools
- machinepools/status
verbs:
- create
- get
- list
- patch
- watch
- apiGroups:
- cluster.x-k8s.io
resources:
- machines
verbs:
- delete
- get
- list
- watch
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
Expand All @@ -108,6 +126,13 @@ rules:
- patch
- update
- watch
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
- awsmanagedcontrolplanes/finalizers
- rosacontrolplanes/finalizers
verbs:
- update
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
Expand All @@ -119,12 +144,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
- rosacontrolplanes/finalizers
verbs:
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
Expand All @@ -150,11 +169,9 @@ rules:
- awsclusters
- awsfargateprofiles
- awsmachinepools
- awsmachines
- awsmanagedclusters
- awsmanagedmachinepools
- rosaclusters
- rosamachinepools
verbs:
- delete
- get
Expand All @@ -167,12 +184,21 @@ rules:
resources:
- awsclusters/status
- awsfargateprofiles/status
- awsmachinetemplates/status
- rosaclusters/status
- rosamachinepools/status
- rosanetworks/status
- rosaroleconfigs/status
verbs:
- get
- patch
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- awsmachinepools/finalizers
verbs:
- delete
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
Expand All @@ -186,9 +212,37 @@ rules:
- patch
- update
- watch
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- awsmachines
- rosamachinepools
- rosanetworks
- rosaroleconfigs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- rosamachinepools/finalizers
- rosanetworks/finalizers
- rosaroleconfigs/finalizers
verbs:
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- rosamachinepools/status
verbs:
- create
- get
- list
- patch
- update
- watch
9 changes: 1 addition & 8 deletions spectro/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,4 @@ patchesJson6902:
name: controller-manager
namespace: system
version: v1
path: patch_service_account.yaml
- target:
group: apps
kind: Deployment
name: controller-manager
namespace: system
version: v1
path: patch_healthcheck.yaml
path: patch_healthcheck.yaml
2 changes: 0 additions & 2 deletions spectro/base/patch_service_account.yaml
View file
Open in desktop

This file was deleted.

75 changes: 65 additions & 10 deletions spectro/generated/core-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ rules:
- get
- list
- watch
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- get
- list
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand Down Expand Up @@ -131,8 +139,8 @@ rules:
- clusters
- clusters/status
- machinedeployments
- machines
- machines/status
- machinesets
verbs:
- get
- list
Expand All @@ -143,10 +151,20 @@ rules:
- machinepools
- machinepools/status
verbs:
- create
- get
- list
- patch
- watch
- apiGroups:
- cluster.x-k8s.io
resources:
- machines
verbs:
- delete
- get
- list
- watch
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
Expand All @@ -167,6 +185,13 @@ rules:
- patch
- update
- watch
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
- awsmanagedcontrolplanes/finalizers
- rosacontrolplanes/finalizers
verbs:
- update
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
Expand All @@ -178,12 +203,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- controlplane.cluster.x-k8s.io
resources:
- rosacontrolplanes/finalizers
verbs:
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
Expand All @@ -209,11 +228,9 @@ rules:
- awsclusters
- awsfargateprofiles
- awsmachinepools
- awsmachines
- awsmanagedclusters
- awsmanagedmachinepools
- rosaclusters
- rosamachinepools
verbs:
- delete
- get
Expand All @@ -226,12 +243,21 @@ rules:
resources:
- awsclusters/status
- awsfargateprofiles/status
- awsmachinetemplates/status
- rosaclusters/status
- rosamachinepools/status
- rosanetworks/status
- rosaroleconfigs/status
verbs:
- get
- patch
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- awsmachinepools/finalizers
verbs:
- delete
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
Expand All @@ -245,12 +271,40 @@ rules:
- patch
- update
- watch
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- awsmachines
- rosamachinepools
- rosanetworks
- rosaroleconfigs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- rosamachinepools/finalizers
- rosanetworks/finalizers
- rosaroleconfigs/finalizers
verbs:
- update
- apiGroups:
- infrastructure.cluster.x-k8s.io
resources:
- rosamachinepools/status
verbs:
- create
- get
- list
- patch
- update
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down Expand Up @@ -373,6 +427,7 @@ spec:
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
serviceAccountName: capa-controller-manager
terminationGracePeriodSeconds: 10
tolerations:
- effect: NoSchedule
Expand Down
2 changes: 1 addition & 1 deletion spectro/generated/core-global.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17928,10 +17928,10 @@ spec:
name: cert
readOnly: true
securityContext:
fsGroup: 1000
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
serviceAccountName: manager
terminationGracePeriodSeconds: 10
tolerations:
- effect: NoSchedule
Expand Down
10 changes: 0 additions & 10 deletions spectro/global/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ bases:
- ../../config/webhook

patchesStrategicMerge:
- ../../config/default/manager_service_account_patch.yaml
- ../../config/default/manager_pull_policy.yaml
- ../../config/default/manager_webhook_patch.yaml
- ../../config/default/webhookcainjection_patch.yaml
Expand Down Expand Up @@ -50,12 +49,3 @@ vars:
kind: Service
version: v1
name: webhook-service

patchesJson6902:
- target:
group: apps
kind: Deployment
name: controller-manager
namespace: system
version: v1
path: patch_service_account.yaml
2 changes: 0 additions & 2 deletions spectro/global/patch_service_account.yaml
View file
Open in desktop

This file was deleted.

Loading