Skip to content

Move rbac up to CVO. Drop admin perms dup #214

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

Closed
enxebre wants to merge 1 commit into from
Closed

Move rbac up to CVO. Drop admin perms dup #214

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
3 changes: 0 additions & 3 deletions cmd/machine-api-operator/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ func startControllers(ctx *ControllerContext) error {
startOpts.imagesFile,

config,
ctx.KubeNamespacedInformerFactory.Core().V1().ServiceAccounts(),
ctx.KubeNamespacedInformerFactory.Apps().V1().Deployments(),
ctx.KubeNamespacedInformerFactory.Rbac().V1().ClusterRoles(),
ctx.KubeNamespacedInformerFactory.Rbac().V1().ClusterRoleBindings(),

ctx.ClientBuilder.KubeClientOrDie(componentName),
ctx.ClientBuilder.OpenshiftClientOrDie(componentName),
Expand Down
118 changes: 110 additions & 8 deletions install/0000_30_machine-api-operator_08_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,115 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: machine-api-manager
rules:
- apiGroups:
- cluster.k8s.io
resources:
- clusters
- clusters/status
- machines
- machines/status
- machinesets
- machinesets/status
- machinedeployments
- machinedeployments/status
verbs:
- get
- list
- watch
- create
- update
- patch
- delete

- apiGroups:
- machine.openshift.io
resources:
- clusters
- clusters/status
- machines
- machines/status
- machinesets
- machinesets/status
- machinedeployments
- machinedeployments/status
verbs:
- get
- list
- watch
- create
- update
- patch
- delete

- apiGroups:
- apps
resources:
- deployments
verbs:
- get
- list
- watch
- create
- update
- patch
- delete

- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- list
- watch
- create
- update
- patch
- delete

- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- watch
- create
- update
- patch
- delete

- apiGroups:
- healthchecking.openshift.io
resources:
- '*'
verbs:
- '*'

- apiGroups:
- config.openshift.io
resources:
- clusteroperators
- clusteroperators/status
verbs:
- create
- get
- update

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: default-account-openshift-machine-api
subjects:
- kind: ServiceAccount
name: default
namespace: openshift-machine-api
name: machine-api-manager-rolebinding
roleRef:
kind: ClusterRole
name: cluster-admin
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: machine-api-manager
subjects:
- kind: ServiceAccount
name: default
namespace: openshift-machine-api
12 changes: 0 additions & 12 deletions owned-manifests/clusterapi-manager-cluster-role-binding.yaml
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions owned-manifests/clusterapi-manager-cluster-role.yaml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
appsinformersv1 "k8s.io/client-go/informers/apps/v1"
coreinformersv1 "k8s.io/client-go/informers/core/v1"
rbacinformersv1 "k8s.io/client-go/informers/rbac/v1"
"k8s.io/client-go/kubernetes"
coreclientsetv1 "k8s.io/client-go/kubernetes/typed/core/v1"
appslisterv1 "k8s.io/client-go/listers/apps/v1"
Expand Down Expand Up @@ -60,10 +58,7 @@ func New(

config string,

serviceAccountInfomer coreinformersv1.ServiceAccountInformer,
deployInformer appsinformersv1.DeploymentInformer,
clusterRoleInformer rbacinformersv1.ClusterRoleInformer,
clusterRoleBindingInformer rbacinformersv1.ClusterRoleBindingInformer,

kubeClient kubernetes.Interface,
osClient osclientset.Interface,
Expand All @@ -82,10 +77,7 @@ func New(
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "machineapioperator"),
}

serviceAccountInfomer.Informer().AddEventHandler(optr.eventHandler())
deployInformer.Informer().AddEventHandler(optr.eventHandler())
clusterRoleInformer.Informer().AddEventHandler(optr.eventHandler())
clusterRoleBindingInformer.Informer().AddEventHandler(optr.eventHandler())

optr.config = config
optr.syncHandler = optr.sync
Expand Down
18 changes: 0 additions & 18 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,6 @@ func (optr *Operator) syncAll(config OperatorConfig) error {
}

func (optr *Operator) syncClusterAPIController(config OperatorConfig) error {
crBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "clusterapi-manager-cluster-role.yaml"))
if err != nil {
return err
}
cr := resourceread.ReadClusterRoleV1OrDie(crBytes)
_, _, err = resourceapply.ApplyClusterRole(optr.kubeClient.RbacV1(), cr)
if err != nil {
return err
}
crbBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "clusterapi-manager-cluster-role-binding.yaml"))
if err != nil {
return err
}
crb := resourceread.ReadClusterRoleBindingV1OrDie(crbBytes)
_, _, err = resourceapply.ApplyClusterRoleBinding(optr.kubeClient.RbacV1(), crb)
if err != nil {
return err
}
controllerBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "clusterapi-manager-controllers.yaml"))
if err != nil {
return err
Expand Down