Allow passing linodeApitoken and region as secretRef

linode · Aug 30, 2023 · b6badd4 · b6badd4
1 parent 4930728
commit b6badd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/deploy/chart/templates/ccm-linode.yaml b/deploy/chart/templates/ccm-linode.yaml
@@ -8,4 +8,5 @@ stringData:
   apiToken: {{ required ".Values.apiToken required" .Values.apiToken }}
   region: {{ required ".Values.region required" .Values.region }}
 type: Opaque
-{{- end }}
+{{- end }}
+
diff --git a/deploy/chart/templates/daemonset.yaml b/deploy/chart/templates/daemonset.yaml
@@ -40,15 +40,17 @@ spec:
             - name: LINODE_API_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.secretRef.name | default "ccm-linode"}}
-                  key: {{ .Values.secretRef.apiTokenRef | default "apiToken"}}
+                  name: {{ if .Values.secretRef }}{{ .Values.secretRef.name | default "ccm-linode" }}{{ else }}"ccm-linode"{{ end }}
+                  key: {{ if .Values.secretRef }}{{ .Values.secretRef.apiTokenRef | default "apiToken" }}{{ else }}"apiToken"{{ end }}
             - name: LINODE_REGION
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.secretRef.name | default "ccm-linode"}}
-                  key: {{ .Values.secretRef.regionRef | default "region"}}
+                  name: {{ if .Values.secretRef }}{{ .Values.secretRef.name | default "ccm-linode" }}{{ else }}"ccm-linode"{{ end }}
+                  key: {{ if .Values.secretRef }}{{ .Values.secretRef.regionRef | default "region" }}{{ else }}"region"{{ end }}
+            {{if .Values.env}}
             {{- toYaml .Values.env | nindent 12 }}
+            {{end}}
       volumes:
         - name: k8s
           hostPath:
-            path: /etc/kubernetes
+            path: /etc/kubernetes