Skip token and auth secret creation for license-proxyserver in ocm mode

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

Author: tamalsaha

charts/license-proxyserver/templates/deployment.yaml

@@ -45,7 +45,11 @@ spec:
         - --tls-private-key-file=/var/serving-cert/tls.key
         - --cache-dir=/tmp/licenses
         - --use-kubeapiserver-fqdn-for-aks={{ .Values.apiserver.useKubeapiserverFqdnForAks }}
-        {{- if and (include "platform.tokenSecretName" .) (empty .Values.hubKubeconfigSecretName) }}
+        - --license-dir=/var/run/secrets/appscode/license
+        {{- if .Values.hubKubeconfigSecretName }}
+        - --hub-kubeconfig=/var/run/secrets/ocm/auth/kubeconfig
+        {{- else }}
+        {{- if include "platform.tokenSecretName" . }}
         - --baseURL={{ .Values.platform.baseURL }}
         - --token=$(PLATFORM_API_TOKEN)
         {{- end }}
@@ -55,9 +59,6 @@ spec:
         {{- if .Values.platform.insecureSkipTLSVerify }}
         - --insecure-skip-tls-verify={{ .Values.platform.insecureSkipTLSVerify }}
         {{- end }}
-        - --license-dir=/var/run/secrets/appscode/license
-        {{- if .Values.hubKubeconfigSecretName }}
-        - --hub-kubeconfig=/var/run/secrets/ocm/auth/kubeconfig
         {{- end }}
         {{- if .Values.clusterName }}
         - --cluster-name={{ .Values.clusterName }}
@@ -73,11 +74,11 @@ spec:
         {{- with .Values.env }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with include "platform.tokenSecretName" . }}
+        {{- if and (include "platform.tokenSecretName" .) (empty .Values.hubKubeconfigSecretName) }}
         - name: PLATFORM_API_TOKEN
           valueFrom:
             secretKeyRef:
-              name: {{ . }}
+              name: {{ include "platform.tokenSecretName" . }}
               key: token
         {{- end }}
         - name: POD_NAME
@@ -114,11 +115,12 @@ spec:
         {{- if .Values.hubKubeconfigSecretName }}
         - mountPath: /var/run/secrets/ocm/auth
           name: ocm-auth
-        {{- end }}
+        {{- else }}
         {{- if .Values.platform.caBundle }}
         - mountPath: /var/platform-auth
           name: platform-auth
         {{- end }}
+        {{- end }}
       volumes:
       - name: cache-dir
         emptyDir: {}

charts/license-proxyserver/templates/platform-auth.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.platform.caBundle }}
+{{- if and .Values.platform.caBundle (empty .Values.hubKubeconfigSecretName) }}
 {{ $data := dict "ca.crt" .Values.platform.caBundle }}
 apiVersion: v1
 kind: Secret

charts/license-proxyserver/templates/token.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.platform.token }}
+{{- if and .Values.platform.token (empty .Values.hubKubeconfigSecretName) }}
 apiVersion: v1
 kind: Secret
 metadata: