Fix putting tuples into configmap and secret

charts/drone-runner-kube/Chart.yaml

@@ -10,7 +10,7 @@ description: Helm chart to deploy a Kubernetes runner for Drone
 type: application
 appVersion: 1.0.0-rc.2
 
-version: 1.0.2
+version: 1.0.3
 
 maintainers:
   - name: kang-makes

charts/drone-runner-kube/ci/test-populate-configmap.yaml

@@ -0,0 +1,4 @@
+env:
+  configMap:
+    KEY_1: value 1
+    KEY_2: value 2

charts/drone-runner-kube/ci/test-populate-secret.yaml

@@ -0,0 +1,4 @@
+env:
+  secret:
+    KEY_1: value 1
+    KEY_2: value 2

charts/drone-runner-kube/templates/configmap.yaml

@@ -1,10 +1,12 @@
+{{- $fullName := include "drone-runner-kube.fullname" . -}}
+{{- $namespace := .Release.Namespace -}}
 {{- with .Values.env.configMap }}
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ include "drone-runner-kube.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ $fullName }}
+  namespace: {{ $namespace }}
 data:
   {{- toYaml . | nindent 2 }}
 {{- end }}

charts/drone-runner-kube/templates/secret.yaml

@@ -1,10 +1,12 @@
+{{- $fullName := include "drone-runner-kube.fullname" . -}}
+{{- $namespace := .Release.Namespace -}}
 {{- with .Values.env.secret }}
 ---
 kind: Secret
 apiVersion: v1
 metadata:
-  name: {{ include "drone-runner-kube.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ $fullName }}
+  namespace: {{ $namespace }}
 stringData:
   {{- toYaml . | nindent 2 }}
 {{- end }}

charts/drone-server/Chart.yaml

@@ -10,7 +10,7 @@ description: Helm chart to deploy Drone CI in Kubernetes
 type: application
 appVersion: 2.5.0
 
-version: 1.0.1
+version: 1.0.2
 
 maintainers:
   - name: kang-makes

charts/drone-server/ci/test-populate-configmap.yaml

@@ -0,0 +1,4 @@
+env:
+  configMap:
+    KEY_1: value 1
+    KEY_2: value 2

charts/drone-server/ci/test-populate-secret.yaml

@@ -0,0 +1,4 @@
+env:
+  secret:
+    KEY_1: value 1
+    KEY_2: value 2

charts/drone-server/templates/configmap.yaml

@@ -1,10 +1,12 @@
+{{- $fullName := include "drone-server.fullname" . -}}
+{{- $namespace := .Release.Namespace -}}
 {{- with .Values.env.configMap }}
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ include "drone-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ $fullName }}
+  namespace: {{ $namespace }}
 data:
   {{- toYaml . | nindent 2 }}
 {{- end }}

charts/drone-server/templates/secret.yaml

@@ -1,10 +1,12 @@
+{{- $fullName := include "drone-server.fullname" . -}}
+{{- $namespace := .Release.Namespace -}}
 {{- with .Values.env.secret }}
 ---
 kind: Secret
 apiVersion: v1
 metadata:
-  name: {{ include "drone-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ $fullName }}
+  namespace: {{ $namespace }}
 stringData:
   {{- toYaml . | nindent 2 }}
 {{- end }}