diff --git a/charts/apisix-ingress-controller/templates/cluster_role.yaml b/charts/apisix-ingress-controller/templates/cluster_role.yaml index d3149bc2..6de1cf66 100644 --- a/charts/apisix-ingress-controller/templates/cluster_role.yaml +++ b/charts/apisix-ingress-controller/templates/cluster_role.yaml @@ -17,7 +17,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ .Release.Name }}-apisix-ingress-manager-role + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-manager-role rules: - apiGroups: - "" @@ -155,7 +155,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ .Release.Name }}-apisix-ingress-metrics-auth-role + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-metrics-auth-role rules: - apiGroups: - authentication.k8s.io @@ -173,7 +173,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ .Release.Name }}-apisix-ingress-metrics-reader + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-metrics-reader rules: - nonResourceURLs: - /metrics diff --git a/charts/apisix-ingress-controller/templates/cluster_role_binding.yaml b/charts/apisix-ingress-controller/templates/cluster_role_binding.yaml index d4eb033f..ef8dd310 100644 --- a/charts/apisix-ingress-controller/templates/cluster_role_binding.yaml +++ b/charts/apisix-ingress-controller/templates/cluster_role_binding.yaml @@ -19,25 +19,25 @@ kind: ClusterRoleBinding metadata: labels: {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }} - name: {{ .Release.Name }}-apisix-ingress-manager-rolebinding + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ .Release.Name }}-apisix-ingress-manager-role + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-manager-role subjects: - kind: ServiceAccount - name: {{ .Release.Name }} + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ .Release.Name }}-apisix-ingress-metrics-auth-rolebinding + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-metrics-auth-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ .Release.Name }}-apisix-ingress-metrics-auth-role + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-metrics-auth-role subjects: - kind: ServiceAccount - name: {{ .Release.Name }} + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }} namespace: {{ .Release.Namespace }} diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml b/charts/apisix-ingress-controller/templates/configmap.yaml index 64955593..c9b4064f 100644 --- a/charts/apisix-ingress-controller/templates/configmap.yaml +++ b/charts/apisix-ingress-controller/templates/configmap.yaml @@ -17,7 +17,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Release.Name }}-ingress-config + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-ingress-config namespace: {{ .Release.Namespace }} data: config.yaml: | diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml b/charts/apisix-ingress-controller/templates/deployment.yaml index 746ea8d8..91e2c3f2 100644 --- a/charts/apisix-ingress-controller/templates/deployment.yaml +++ b/charts/apisix-ingress-controller/templates/deployment.yaml @@ -58,7 +58,7 @@ spec: name: metrics protocol: TCP volumeMounts: - - name: {{ .Release.Name }}-ingress-config + - name: config mountPath: /app/conf/config.yaml subPath: config.yaml livenessProbe: @@ -95,10 +95,10 @@ spec: {{- tpl (. | toYaml) $ | nindent 8 }} {{- end }} volumes: - - name: {{ .Release.Name }}-ingress-config + - name: config configMap: - name: {{ .Release.Name }}-ingress-config + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-ingress-config securityContext: runAsNonRoot: false - serviceAccountName: {{ .Release.Name }} + serviceAccountName: {{ include "apisix-ingress-controller-manager.name.fullname" . }} terminationGracePeriodSeconds: 10 diff --git a/charts/apisix-ingress-controller/templates/gatewayproxy.yaml b/charts/apisix-ingress-controller/templates/gatewayproxy.yaml index 8c767cbc..f172c681 100644 --- a/charts/apisix-ingress-controller/templates/gatewayproxy.yaml +++ b/charts/apisix-ingress-controller/templates/gatewayproxy.yaml @@ -19,7 +19,7 @@ apiVersion: apisix.apache.org/v1alpha1 kind: GatewayProxy metadata: namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-config + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-config spec: provider: type: {{ .Values.gatewayProxy.provider.type }} diff --git a/charts/apisix-ingress-controller/templates/ingress-class.yaml b/charts/apisix-ingress-controller/templates/ingress-class.yaml index 4e4e77e5..4fd9a20e 100644 --- a/charts/apisix-ingress-controller/templates/ingress-class.yaml +++ b/charts/apisix-ingress-controller/templates/ingress-class.yaml @@ -28,7 +28,7 @@ spec: parameters: apiGroup: apisix.apache.org kind: GatewayProxy - name: {{ .Release.Name }}-config + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-config namespace: {{ .Release.Namespace }} scope: Namespace {{- end}} diff --git a/charts/apisix-ingress-controller/templates/role.yaml b/charts/apisix-ingress-controller/templates/role.yaml index 0014ec02..3567040a 100644 --- a/charts/apisix-ingress-controller/templates/role.yaml +++ b/charts/apisix-ingress-controller/templates/role.yaml @@ -19,7 +19,7 @@ kind: Role metadata: labels: {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }} - name: {{ .Release.Name }}-apisix-ingress-leader-election-role + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-leader-election-role namespace: {{ .Release.Namespace }} rules: - apiGroups: diff --git a/charts/apisix-ingress-controller/templates/role_binding.yaml b/charts/apisix-ingress-controller/templates/role_binding.yaml index b94e3c68..1f03240a 100644 --- a/charts/apisix-ingress-controller/templates/role_binding.yaml +++ b/charts/apisix-ingress-controller/templates/role_binding.yaml @@ -19,13 +19,13 @@ kind: RoleBinding metadata: labels: {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }} - name: {{ .Release.Name }}-apisix-ingress-leader-election-rolebinding + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-leader-election-rolebinding namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ .Release.Name }}-apisix-ingress-leader-election-role + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-leader-election-role subjects: - kind: ServiceAccount - name: {{ .Release.Name }} + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }} namespace: {{ .Release.Namespace }} diff --git a/charts/apisix-ingress-controller/templates/service-account.yaml b/charts/apisix-ingress-controller/templates/service-account.yaml index befb5ac3..370829ad 100644 --- a/charts/apisix-ingress-controller/templates/service-account.yaml +++ b/charts/apisix-ingress-controller/templates/service-account.yaml @@ -19,5 +19,5 @@ kind: ServiceAccount metadata: labels: {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }} - name: {{ .Release.Name }} + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }} namespace: {{ .Release.Namespace }}