Replace controller to manager

h0n9 · Jul 19, 2022 · 39742e8 · 39742e8
1 parent c6d4040
commit 39742e8
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/charts/cloud-secrets-manager/templates/_helpers.tpl b/charts/cloud-secrets-manager/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "cloud-secrets-controller.name" -}}
+{{- define "cloud-secrets-manager.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "cloud-secrets-controller.fullname" -}}
+{{- define "cloud-secrets-manager.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "cloud-secrets-controller.chart" -}}
+{{- define "cloud-secrets-manager.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "cloud-secrets-controller.labels" -}}
-helm.sh/chart: {{ include "cloud-secrets-controller.chart" . }}
-{{ include "cloud-secrets-controller.selectorLabels" . }}
+{{- define "cloud-secrets-manager.labels" -}}
+helm.sh/chart: {{ include "cloud-secrets-manager.chart" . }}
+{{ include "cloud-secrets-manager.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "cloud-secrets-controller.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "cloud-secrets-controller.name" . }}
+{{- define "cloud-secrets-manager.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "cloud-secrets-manager.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "cloud-secrets-controller.serviceAccountName" -}}
+{{- define "cloud-secrets-manager.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "cloud-secrets-controller.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "cloud-secrets-manager.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

diff --git a/charts/cloud-secrets-manager/templates/deployment.yaml b/charts/cloud-secrets-manager/templates/deployment.yaml
@@ -1,27 +1,27 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "cloud-secrets-controller.fullname" . }}
+  name: {{ include "cloud-secrets-manager.fullname" . }}
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      {{- include "cloud-secrets-controller.selectorLabels" . | nindent 6 }}
+      {{- include "cloud-secrets-manager.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "cloud-secrets-controller.selectorLabels" . | nindent 8 }}
+        {{- include "cloud-secrets-manager.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "cloud-secrets-controller.serviceAccountName" . }}
+      serviceAccountName: {{ include "cloud-secrets-manager.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
@@ -63,7 +63,7 @@ spec:
       volumes:
         - name: certs
           secret:
-            secretName: {{ include "cloud-secrets-controller.fullname" . }}-tls
+            secretName: {{ include "cloud-secrets-manager.fullname" . }}-tls
             optional: false
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/cloud-secrets-manager/templates/mutatingwebhook.yaml b/charts/cloud-secrets-manager/templates/mutatingwebhook.yaml
@@ -1,14 +1,14 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  name: {{ include "cloud-secrets-controller.fullname" . }}
+  name: {{ include "cloud-secrets-manager.fullname" . }}
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
 webhooks:
   - clientConfig:
       caBundle: Cg==
       service:
-        name: {{ include "cloud-secrets-controller.fullname" . }}
+        name: {{ include "cloud-secrets-manager.fullname" . }}
         path: /mutate
         port: {{ .Values.service.port }}
         namespace: {{ .Release.Namespace }}

diff --git a/charts/cloud-secrets-manager/templates/rbac.yaml b/charts/cloud-secrets-manager/templates/rbac.yaml
@@ -1,9 +1,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "cloud-secrets-controller.fullname" . }}
+  name: {{ include "cloud-secrets-manager.fullname" . }}
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
 rules:
   - apiGroups: ["admissionregistration.k8s.io"]
     resources: ["mutatingwebhookconfigurations"]
@@ -15,14 +15,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "cloud-secrets-controller.fullname" . }}
+  name: {{ include "cloud-secrets-manager.fullname" . }}
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "cloud-secrets-controller.serviceAccountName" . }}
+    name: {{ include "cloud-secrets-manager.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ include "cloud-secrets-controller.fullname" . }}
+  name: {{ include "cloud-secrets-manager.fullname" . }}
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/cloud-secrets-manager/templates/secret.yaml b/charts/cloud-secrets-manager/templates/secret.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "cloud-secrets-controller.fullname" . }}-tls
+  name: {{ include "cloud-secrets-manager.fullname" . }}-tls
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
 type: kubernetes.io/tls
 data:
   ca.crt: Cg==

diff --git a/charts/cloud-secrets-manager/templates/service.yaml b/charts/cloud-secrets-manager/templates/service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "cloud-secrets-controller.fullname" . }}
+  name: {{ include "cloud-secrets-manager.fullname" . }}
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: https
   selector:
-    {{- include "cloud-secrets-controller.selectorLabels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.selectorLabels" . | nindent 4 }}
diff --git a/charts/cloud-secrets-manager/templates/serviceaccount.yaml b/charts/cloud-secrets-manager/templates/serviceaccount.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "cloud-secrets-controller.serviceAccountName" . }}
+  name: {{ include "cloud-secrets-manager.serviceAccountName" . }}
   labels:
-    {{- include "cloud-secrets-controller.labels" . | nindent 4 }}
+    {{- include "cloud-secrets-manager.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}