Always mount license secret into proxyserver (#377)

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · May 17, 2024 · 4aa648e · 4aa648e
1 parent 1f03aea
commit 4aa648e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/charts/license-proxyserver/templates/deployment.yaml b/charts/license-proxyserver/templates/deployment.yaml
@@ -47,9 +47,7 @@ spec:
         - --baseURL={{ .Values.platform.baseURL }}
         - --token=$(PLATFORM_API_TOKEN)
         {{- end }}
-        {{- if (or .Values.licenses .Values.encodedLicenses .Values.hubKubeconfigSecretName) }}
         - --license-dir=/var/run/secrets/appscode/license
-        {{- end }}
         {{- if .Values.hubKubeconfigSecretName }}
         - --hub-kubeconfig=/var/run/secrets/ocm/auth/kubeconfig
         {{- end }}
@@ -93,10 +91,8 @@ spec:
           name: cache-dir
         - mountPath: /var/serving-cert
           name: serving-cert
-        {{- if (or .Values.licenses .Values.encodedLicenses .Values.hubKubeconfigSecretName) }}
         - mountPath: /var/run/secrets/appscode/license
           name: licenses
-        {{- end }}
         {{- if .Values.hubKubeconfigSecretName }}
         - mountPath: /var/run/secrets/ocm/auth
           name: ocm-auth
@@ -108,13 +104,11 @@ spec:
         secret:
           defaultMode: 420
           secretName: {{ include "license-proxyserver.fullname" . }}-apiserver-cert
-      {{- if (or .Values.licenses .Values.encodedLicenses .Values.hubKubeconfigSecretName) }}
       - name: licenses
         secret:
           defaultMode: 420
           secretName: {{ include "license-proxyserver.fullname" . }}-licenses
           optional: true
-      {{- end }}
       {{- if .Values.hubKubeconfigSecretName }}
       - name: ocm-auth
         secret:

diff --git a/charts/license-proxyserver/templates/licenses.yaml b/charts/license-proxyserver/templates/licenses.yaml
@@ -1,4 +1,3 @@
-{{- if (or .Values.licenses .Values.encodedLicenses) }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -14,4 +13,3 @@ data:
 {{- range $k, $v := .Values.encodedLicenses }}
   e_{{ $k }}: {{ $v | quote }}
 {{- end }}
-{{- end }}