Always mount license secret into proxyserver

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

Author: tamalsaha

pkg/manager/agent-manifests/license-proxyserver/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Kubernetes license-proxyserver by AppsCode
 name: license-proxyserver
-version: v2024.2.25
-appVersion: v0.0.8
+version: v2024.5.17
+appVersion: v0.0.9
 home: https://github.com/bytebuilders/license-proxyserver
 icon: https://cdn.appscode.com/images/products/searchlight/icons/android-icon-192x192.png
 sources:

pkg/manager/agent-manifests/license-proxyserver/README.md

@@ -7,8 +7,8 @@
 ```bash
 $ helm repo add appscode https://charts.appscode.com/stable
 $ helm repo update
-$ helm search repo appscode/license-proxyserver --version=v2024.2.25
-$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.2.25
+$ helm search repo appscode/license-proxyserver --version=v2024.5.17
+$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.5.17
 ```
 
 ## Introduction
@@ -24,7 +24,7 @@ This chart deploys a Kubernetes license proxyserver on a [Kubernetes](http://kub
 To install/upgrade the chart with the release name `license-proxyserver`:
 
 ```bash
-$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.2.25
+$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.5.17
 ```
 
 The command deploys a Kubernetes license proxyserver on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -89,12 +89,12 @@ The following table lists the configurable parameters of the `license-proxyserve
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
 
 ```bash
-$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.2.25 --set replicaCount=1
+$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.5.17 --set replicaCount=1
 ```
 
 Alternatively, a YAML file that specifies the values for the parameters can be provided while
 installing the chart. For example:
 
 ```bash
-$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.2.25 --values values.yaml
+$ helm upgrade -i license-proxyserver appscode/license-proxyserver -n kubeops --create-namespace --version=v2024.5.17 --values values.yaml
 ```

pkg/manager/agent-manifests/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:

pkg/manager/agent-manifests/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 }}