Generated commit to update templated files based on rev 91bef8a in st…

…ackabletech/operator-templating repo. (#38) Original commit message: Rename objects created by Helm charts. (#12)
stackabletech · Nov 25, 2021 · 5f3b43a · 5f3b43a
1 parent 5ebcea3
commit 5f3b43a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/deploy/helm/druid-operator/templates/configmap.yaml b/deploy/helm/druid-operator/templates/configmap.yaml
@@ -7,6 +7,6 @@ data:
 {{ (.Files.Glob "configs/*").AsConfig | indent 2 }}
 kind: ConfigMap
 metadata:
-  name: {{ include "operator.fullname" . }}-configspec
+  name: {{ .Release.Name }}-configmap
   labels:
   {{- include "operator.labels" . | nindent 4 }}
diff --git a/deploy/helm/druid-operator/templates/deployment.yaml b/deploy/helm/druid-operator/templates/deployment.yaml
@@ -5,7 +5,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "operator.fullname" . }}
+  name: {{ .Release.Name }}-deployment
   labels:
     {{- include "operator.labels" . | nindent 4 }}
 spec:
@@ -29,7 +29,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "operator.serviceAccountName" . }}
+      serviceAccountName: {{ .Release.Name }}-serviceaccount
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -46,7 +46,7 @@ spec:
       volumes:
         - name: config-spec
           configMap:
-            name: {{ include "operator.fullname" . }}-configspec
+            name: {{ .Release.Name }}-configmap
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/deploy/helm/druid-operator/templates/roles.yaml b/deploy/helm/druid-operator/templates/roles.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "operator.name" . }}-operator
+  name: {{ .Release.Name }}-clusterrole
 rules:
   # For Apache ZooKeeper dependents
   - apiGroups:

diff --git a/deploy/helm/druid-operator/templates/serviceaccount.yaml b/deploy/helm/druid-operator/templates/serviceaccount.yaml
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "operator.serviceAccountName" . }}
+  name: {{ .Release.Name }}-serviceaccount
   labels:
     {{- include "operator.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
@@ -18,15 +18,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 # This cluster role binding allows anyone in the "manager" group to read secrets in any namespace.
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "operator.serviceAccountName" . }}-rolebinding
+  name: {{ .Release.Name }}-clusterrolebinding
   labels:
     {{- include "operator.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "operator.serviceAccountName" . }}
+    name: {{ .Release.Name }}-serviceaccount
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ include "operator.serviceAccountName" . }}
+  name: {{ .Release.Name }}-clusterrole
   apiGroup: rbac.authorization.k8s.io
 {{- end }}