Merge pull request #134 from schinmai-akamai/master

Allow passing linodeApitoken and region as secretRef

Author: srust

.github/workflows/test.yml

@@ -16,3 +16,7 @@ jobs:
         run: make docker-build
       - name: unit test
         run: make test
+      - name: helm lint
+        run: make helm-lint
+      - name: helm template
+        run: make helm-template

Makefile

@@ -74,5 +74,33 @@ run-debug: build
 		--stderrthreshold=INFO \
 		--kubeconfig=${KUBECONFIG} \
 		--linodego-debug
-
-
+# Set the host's OS. Only linux and darwin supported for now
+HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
+ifeq ($(filter darwin linux,$(HOSTOS)),)
+$(error build only supported on linux and darwin host currently)
+endif
+
+HELM_VERSION ?= v3.9.1
+TOOLS_HOST_DIR ?= .tmp/tools
+HELM := $(TOOLS_HOST_DIR)/helm-$(HELM_VERSION)
+
+.PHONY: $(HELM)
+$(HELM):
+	@echo installing helm $(HELM_VERSION)
+	@mkdir -p $(TOOLS_HOST_DIR)/tmp-helm
+	@curl -fsSL https://get.helm.sh/helm-$(HELM_VERSION)-$(HOSTOS)-amd64.tar.gz | tar -xz -C $(TOOLS_HOST_DIR)/tmp-helm
+	@mv $(TOOLS_HOST_DIR)/tmp-helm/$(HOSTOS)-amd64/helm $(HELM)
+	@rm -fr $(TOOLS_HOST_DIR)/tmp-helm
+	@echo installing helm $(HELM_VERSION)
+
+.PHONY: helm-lint
+helm-lint: $(HELM)
+#Verify lint works when region and apiToken are passed, and when it is passed as reference.
+	@$(HELM) lint deploy/chart --set apiToken="apiToken",region="us-east"
+	@$(HELM) lint deploy/chart --set secretRef.apiTokenRef="apiToken",secretRef.name="api",secretRef.regionRef="us-east"
+
+.PHONY: helm-template
+helm-template: $(HELM)
+#Verify template works when region and apiToken are passed, and when it is passed as reference.
+	@$(HELM) template foo deploy/chart --set apiToken="apiToken",region="us-east" > /dev/null
+	@$(HELM) template foo deploy/chart --set secretRef.apiTokenRef="apiToken",secretRef.name="api",secretRef.regionRef="us-east" > /dev/null

deploy/chart/templates/ccm-linode.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.secretRef }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,3 +8,5 @@ stringData:
   apiToken: {{ required ".Values.apiToken required" .Values.apiToken }}
   region: {{ required ".Values.region required" .Values.region }}
 type: Opaque
+{{- end }}
+

deploy/chart/templates/daemonset.yaml

@@ -40,15 +40,17 @@ spec:
             - name: LINODE_API_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: ccm-linode
-                  key: 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: ccm-linode
-                  key: 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

deploy/chart/values.yaml

@@ -1,9 +1,15 @@
-# apiToken [Required] - Must be a Linode APIv4 Personal Access Token with all permissions. (https://cloud.linode.com/profile/tokens)
+# apiToken [Required if secretRef is not set] - Must be a Linode APIv4 Personal Access Token with all permissions. (https://cloud.linode.com/profile/tokens)
 apiToken: ""
 
-# region [Required] - Must be a Linode region. (https://api.linode.com/v4/regions)
+# region [Required if secretRef is not set] - Must be a Linode region. (https://api.linode.com/v4/regions)
 region: ""
 
+# Set these values if your APIToken and region are already present in a k8s secret.
+# secretRef:
+#   name: "linode-ccm"
+#   apiTokenRef: "apiToken"
+#   regionRef: "region"
+
 # node-role.kubernetes.io/master - if set true, it deploys the svc on the master node
 nodeSelector:
   # The CCM will only run on a Node labelled as a master, you may want to change this