Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ check: FORCE static-check build/cover.html build-all

generate: install-controller-gen
@printf "\e[1;36m>> controller-gen\e[0m\n"
@controller-gen crd:allowDangerousTypes=true rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=charts/openstack-hypervisor-operator/crds output:rbac:artifacts:config=config/rbac
@controller-gen crd:allowDangerousTypes=true rbac:roleName=hypervisor-operator-manager-role webhook paths="./..." output:crd:artifacts:config=charts/openstack-hypervisor-operator/crds output:rbac:artifacts:config=charts/openstack-hypervisor-operator/templates
@controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
@controller-gen applyconfiguration paths="./..."

Expand Down
3 changes: 2 additions & 1 deletion Makefile.maker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ controllerGen:
enabled: true
crdOutputPath: charts/openstack-hypervisor-operator/crds
objectHeaderFile: hack/boilerplate.go.txt
rbacRoleName: manager-role
rbacRoleName: hypervisor-operator-manager-role
rbacOutputPath: charts/openstack-hypervisor-operator/templates
allowDangerousTypes: true

coverageTest:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "openstack-hypervisor-operator.fullname" . }}-manager-rolebinding
labels:
{{- include "openstack-hypervisor-operator.labels" . | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: hypervisor-operator-manager-role
subjects:
- kind: ServiceAccount
name: '{{ include "openstack-hypervisor-operator.serviceAccountName" . }}'
namespace: '{{ .Release.Namespace }}'
101 changes: 0 additions & 101 deletions charts/openstack-hypervisor-operator/templates/manager-rbac.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: manager-role
name: hypervisor-operator-manager-role
rules:
- apiGroups:
- ""
Expand Down
Loading