diff --git a/charts/openstack-cloud-controller-manager/templates/clusterrole.yaml b/charts/openstack-cloud-controller-manager/templates/clusterrole.yaml index 7eee6c4e40..6786931f41 100644 --- a/charts/openstack-cloud-controller-manager/templates/clusterrole.yaml +++ b/charts/openstack-cloud-controller-manager/templates/clusterrole.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: system:openstack-cloud-controller-manager + name: {{ .Values.clusterRoleName }} annotations: {{- with .Values.commonAnnotations }} {{- toYaml . | nindent 4 }} diff --git a/charts/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml b/charts/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml index f19f0ef929..a572710908 100644 --- a/charts/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml +++ b/charts/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml @@ -1,7 +1,8 @@ +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: system:openstack-cloud-controller-manager + name: {{ .Values.clusterRoleName }} annotations: {{- with .Values.commonAnnotations }} {{- toYaml . | nindent 4 }} @@ -9,8 +10,8 @@ metadata: roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: system:openstack-cloud-controller-manager + name: {{ .Values.clusterRoleName }} subjects: - kind: ServiceAccount - name: openstack-cloud-controller-manager + name: {{ .Values.serviceAccountName }} namespace: {{ .Release.Namespace | quote }} diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml index aad6808177..aa2006e0d4 100644 --- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml +++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml @@ -37,7 +37,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: openstack-cloud-controller-manager + serviceAccountName: {{ .Values.serviceAccountName }} containers: - name: openstack-cloud-controller-manager image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}" diff --git a/charts/openstack-cloud-controller-manager/templates/serviceaccount.yaml b/charts/openstack-cloud-controller-manager/templates/serviceaccount.yaml index e24737e164..f97f1c8a65 100644 --- a/charts/openstack-cloud-controller-manager/templates/serviceaccount.yaml +++ b/charts/openstack-cloud-controller-manager/templates/serviceaccount.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: openstack-cloud-controller-manager + name: {{ .Values.serviceAccountName }} namespace: {{ .Release.Namespace }} annotations: {{- with .Values.commonAnnotations }} diff --git a/charts/openstack-cloud-controller-manager/values.yaml b/charts/openstack-cloud-controller-manager/values.yaml index af3304713e..e151c74f8e 100644 --- a/charts/openstack-cloud-controller-manager/values.yaml +++ b/charts/openstack-cloud-controller-manager/values.yaml @@ -130,3 +130,7 @@ extraVolumeMounts: # cluster name that used for created cluster cluster: name: kubernetes + +clusterRoleName : system:cloud-controller-manager + +serviceAccountName: cloud-controller-manager