Skip to content

Commit b6badd4

Browse files
committed
Allow passing linodeApitoken and region as secretRef
1 parent 4930728 commit b6badd4

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

deploy/chart/templates/ccm-linode.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ stringData:
88
apiToken: {{ required ".Values.apiToken required" .Values.apiToken }}
99
region: {{ required ".Values.region required" .Values.region }}
1010
type: Opaque
11-
{{- end }}
11+
{{- end }}
12+

deploy/chart/templates/daemonset.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,17 @@ spec:
4040
- name: LINODE_API_TOKEN
4141
valueFrom:
4242
secretKeyRef:
43-
name: {{ .Values.secretRef.name | default "ccm-linode"}}
44-
key: {{ .Values.secretRef.apiTokenRef | default "apiToken"}}
43+
name: {{ if .Values.secretRef }}{{ .Values.secretRef.name | default "ccm-linode" }}{{ else }}"ccm-linode"{{ end }}
44+
key: {{ if .Values.secretRef }}{{ .Values.secretRef.apiTokenRef | default "apiToken" }}{{ else }}"apiToken"{{ end }}
4545
- name: LINODE_REGION
4646
valueFrom:
4747
secretKeyRef:
48-
name: {{ .Values.secretRef.name | default "ccm-linode"}}
49-
key: {{ .Values.secretRef.regionRef | default "region"}}
48+
name: {{ if .Values.secretRef }}{{ .Values.secretRef.name | default "ccm-linode" }}{{ else }}"ccm-linode"{{ end }}
49+
key: {{ if .Values.secretRef }}{{ .Values.secretRef.regionRef | default "region" }}{{ else }}"region"{{ end }}
50+
{{if .Values.env}}
5051
{{- toYaml .Values.env | nindent 12 }}
52+
{{end}}
5153
volumes:
5254
- name: k8s
5355
hostPath:
54-
path: /etc/kubernetes
56+
path: /etc/kubernetes

0 commit comments

Comments
 (0)