Merge pull request #71 from ContainerSolutions/fix-helm-operator-name

introduce operatorName template helper
ContainerSolutions · Aug 14, 2019 · bb3226d · bb3226d
2 parents 13ca2a0 + 300d1aa
commit bb3226d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/deploy/helm/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl
@@ -63,3 +63,10 @@ Create watchNamespace: if not specified assume is release namespace
     {{ default .Release.Namespace }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create operatorName if not specified assume is release name
+*/}}
+{{- define "externalsecret-operator.operatorName" -}}
+    {{ default .Release.Name .Values.operatorName }}
+{{- end -}}
diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
             - name: WATCH_NAMESPACE
               value: {{ template "externalsecret-operator.watchNamespace" . }}
             - name: OPERATOR_NAME
-              value: {{ template "externalsecret-operator.fullname" . }}
+              value: {{ template "externalsecret-operator.operatorName" . }}
             - name: OPERATOR_CONFIG
               valueFrom:
                 secretKeyRef:

diff --git a/deploy/helm/templates/tests/test-create-secret.yaml b/deploy/helm/templates/tests/test-create-secret.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ .Release.Name }}-test
 spec:
   Key: example-externalsecret-key
-  Backend: dummy-example
+  Backend: {{ template "externalsecret-operator.operatorName" . }}
 ---
 # THEN the corresponding Secret is created and its content is as expected 
 apiVersion: v1

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -13,8 +13,9 @@ image:
 watchNamespace: ""
 
 # The name for this operator, must be referenced by ExternalSecret resources
-# as the Backend field
-operatorName: externalsecret-operator
+# as the Backend field.
+# If not set will default to release name.
+operatorName: ""
 
 crds:
   # Specifies wether the ExternalSecret CRD should be created