add secret support for tfo-api chart

GalleyBytes · Apr 10, 2024 · 7a9ea02 · 7a9ea02
1 parent 25867a7
commit 7a9ea02
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/charts/terraform-operator-api/Chart.yaml b/charts/terraform-operator-api/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: 0.8.1
 description: A Helm chart to deploy the terraform-operator-api
 name: terraform-operator-api
-version: 1.0.15
+version: 1.1.0
diff --git a/charts/terraform-operator-api/README.md b/charts/terraform-operator-api/README.md
@@ -1,6 +1,6 @@
 # terraform-operator-api
 
-![Version: 1.0.15](https://img.shields.io/badge/Version-1.0.15-informational?style=flat-square) ![AppVersion: 0.8.1](https://img.shields.io/badge/AppVersion-0.8.1-informational?style=flat-square)
+![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: 0.8.1](https://img.shields.io/badge/AppVersion-0.8.1-informational?style=flat-square)
 
 A Helm chart to deploy the terraform-operator-api
 
@@ -16,12 +16,14 @@ $ helm install galleybytes/terraform-operator-api --namespace tf-system
 | Key | Description | Default |
 |---|---|---|
 | args | `list` Optional args to include for the command | `["use-service-host"]` |
-| env | `list` Env defined like k8s EnvVar https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#envvar-v1-core. | `[]` |
+| env | `list` Env defined like k8s EnvVar https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#envvar-v1-core. | `[]` |
+| envFrom | `list` List of sources to populate environment variables in the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#envfromsource-v1-core | `[]` |
 | image.tag | `string`  | `"0.8.1"` |
 | server.port | `int` The port the runtime exposes to connect to the webserver | `5555` |
 | service.annotations | `object` Service annotations key/values for the service resource | `{}` |
 | service.port | `int` the http or https port clients will use to access the `server.port` | `80` |
 | service.type | `string` service type is one of ClusterIP | LoadBalancer | NodePort | `"ClusterIP"` |
+| secret | `object` Map of environment variables (C_IDENTIFIERS) that will be added to deployment | `{}` |
 | resources | `object` CPU/Memory request and limit configuration | `{}` |
 | nodeSelector | `object` node labels for pod assignment | `{}` |
 | tolerations | `list` List of node taints to tolerate | `[]` |

diff --git a/charts/terraform-operator-api/templates/deployment.yaml b/charts/terraform-operator-api/templates/deployment.yaml
@@ -22,6 +22,14 @@ spec:
         args:
           {{- toYaml . | nindent 8 }}
         {{ end -}}
+        envFrom:
+        {{- with .Values.envFrom }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- if .Values.secret }}
+        - secretRef:
+            name: {{ .Release.Name }}
+        {{- end }}
         env:
         - name: SERVICE_NAME
           value: {{ .Release.Name }}
@@ -57,4 +65,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/charts/terraform-operator-api/templates/secret.yaml b/charts/terraform-operator-api/templates/secret.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.secret -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}
+type: Opaque
+data:
+  {{- range $key, $value := .Values.secret }}
+  {{ $key }}: {{ $value | b64enc | quote }}
+  {{- end }}
+{{- end }}
+
diff --git a/charts/terraform-operator-api/values.yaml b/charts/terraform-operator-api/values.yaml
@@ -2,7 +2,7 @@
 args:
 - use-service-host
 
-# -- Env defined like k8s EnvVar https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#envvar-v1-core.
+# -- Env defined like k8s EnvVar https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#envvar-v1-core.
 env: []
 # - name: DASHBOARD
 #   value: https://<dashboard-host>
@@ -12,6 +12,10 @@ env: []
 #   value: isa
 # - name: ADMIN_PASSWORD
 #   value: $2a$10$2ap6bphr5ZBkEMTBb/ZoT.zrY7lUwzCW2u1n5tIeVugtVpjMRW9Fe
+#
+
+# -- List of sources to populate environment variables in the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#envfromsource-v1-core
+envFrom: []
 
 # Image options
 image:
@@ -32,6 +36,9 @@ service:
   # -- service type is one of ClusterIP | LoadBalancer | NodePort
   type: ClusterIP
 
+# -- Map of environment variables (C_IDENTIFIERS) that will be added to deployment
+secret: {}
+
 
 # -- CPU/Memory request and limit configuration
 resources: {}