Don't mount license vol when both license and licenseSecretName is empty (#312)

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

charts/stash-community/templates/_helpers.tpl

@@ -73,7 +73,11 @@ Returns the appscode license
 Returns the appscode license secret name
 */}}
 {{- define "appscode.licenseSecretName" -}}
-{{- default (printf "%s-license" (include "stash-community.fullname" .)) .Values.licenseSecretName }}
+{{- if .Values.licenseSecretName }}
+{{- .Values.licenseSecretName -}}
+{{- else if .Values.license }}
+{{- printf "%s-license" (include "stash-community.fullname" .) -}}
+{{- end }}
 {{- end }}
 
 {{/*

charts/stash-community/templates/deployment.yaml

@@ -61,7 +61,7 @@ spec:
         - --backup-job-psp={{ .Values.security.podSecurityPolicies | join "," }}
         - --restore-job-psp={{ .Values.security.podSecurityPolicies | join "," }}
         {{- end }}
-        {{- if or (include "appscode.license" .) (include "appscode.licenseSecretName" .) }}
+        {{- if include "appscode.licenseSecretName" . }}
         - --license-file=/var/run/secrets/appscode/license/key.txt
         - --license-apiservice={{ .Values.licenseApiService }}
         {{- end }}
@@ -97,7 +97,7 @@ spec:
           name: serving-cert
         - mountPath: /tmp
           name: stash-scratchdir
-        {{- if or (include "appscode.license" .) (include "appscode.licenseSecretName" .) }}
+        {{- if include "appscode.licenseSecretName" . }}
         - mountPath: /var/run/secrets/appscode/license
           name: license
         {{- end }}
@@ -129,7 +129,7 @@ spec:
         secret:
           defaultMode: 420
           secretName: {{ include "stash-community.fullname" . }}-apiserver-cert
-      {{- if or (include "appscode.license" .) (include "appscode.licenseSecretName" .) }}
+      {{- if include "appscode.licenseSecretName" . }}
       - name: license
         secret:
           defaultMode: 420

charts/stash-enterprise/templates/_helpers.tpl

@@ -73,7 +73,11 @@ Returns the appscode license
 Returns the appscode license secret name
 */}}
 {{- define "appscode.licenseSecretName" -}}
-{{- default (printf "%s-license" (include "stash-enterprise.fullname" .)) .Values.licenseSecretName }}
+{{- if .Values.licenseSecretName }}
+{{- .Values.licenseSecretName -}}
+{{- else if .Values.license }}
+{{- printf "%s-license" (include "stash-enterprise.fullname" .) -}}
+{{- end }}
 {{- end }}
 
 {{/*

charts/stash-enterprise/templates/deployment.yaml

@@ -67,7 +67,7 @@ spec:
         - --restore-job-psp={{ .Values.security.podSecurityPolicies | join "," }}
         - --nva-psp={{ include "netvol-accessor-psp" .}}
         {{- end }}
-        {{- if or (include "appscode.license" .) (include "appscode.licenseSecretName" .) }}
+        {{- if include "appscode.licenseSecretName" . }}
         - --license-file=/var/run/secrets/appscode/license/key.txt
         - --license-apiservice={{ .Values.licenseApiService }}
         {{- end }}
@@ -103,7 +103,7 @@ spec:
           name: serving-cert
         - mountPath: /tmp
           name: stash-scratchdir
-        {{- if or (include "appscode.license" .) (include "appscode.licenseSecretName" .) }}
+        {{- if include "appscode.licenseSecretName" . }}
         - mountPath: /var/run/secrets/appscode/license
           name: license
         {{- end }}
@@ -135,7 +135,7 @@ spec:
         secret:
           defaultMode: 420
           secretName: {{ include "stash-enterprise.fullname" . }}-apiserver-cert
-      {{- if or (include "appscode.license" .) (include "appscode.licenseSecretName" .) }}
+      {{- if include "appscode.licenseSecretName" . }}
       - name: license
         secret:
           defaultMode: 420

charts/stash/templates/_helpers.tpl

@@ -72,7 +72,13 @@ Returns the appscode license
 Returns the appscode license secret name
 */}}
 {{- define "appscode.licenseSecretName" -}}
-{{- list .Values.licenseSecretName .Values.global.licenseSecretName (printf "%s-license" (include "stash.fullname" .)) | compact | first }}
+{{- if .Values.licenseSecretName }}
+{{- .Values.licenseSecretName -}}
+{{- else if .Values.global.licenseSecretName }}
+{{- .Values.global.licenseSecretName -}}
+{{- else if (default .Values.global.license .Values.license) }}
+{{- printf "%s-license" (include "stash.fullname" .) -}}
+{{- end }}
 {{- end }}
 
 {{/*