From d3b63d7e70106f9960d31228225abc9f581ba8d9 Mon Sep 17 00:00:00 2001 From: isaaguilar Date: Fri, 23 Jun 2023 11:25:43 -0400 Subject: [PATCH] make envs tpl values --- charts/terraform-operator-remote-controller/Chart.yaml | 2 +- charts/terraform-operator-remote-controller/README.md | 4 ++-- .../templates/deployment.yaml | 2 +- charts/terraform-operator-remote-controller/values.yaml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/terraform-operator-remote-controller/Chart.yaml b/charts/terraform-operator-remote-controller/Chart.yaml index 7dd6298..025cc8a 100644 --- a/charts/terraform-operator-remote-controller/Chart.yaml +++ b/charts/terraform-operator-remote-controller/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: 1.1.0 description: A Helm chart to deploy the terraform-operator-remote-controller name: terraform-operator-remote-controller -version: 1.0.5 +version: 1.0.6 diff --git a/charts/terraform-operator-remote-controller/README.md b/charts/terraform-operator-remote-controller/README.md index f82ea28..3bbd9dd 100644 --- a/charts/terraform-operator-remote-controller/README.md +++ b/charts/terraform-operator-remote-controller/README.md @@ -1,6 +1,6 @@ # terraform-operator-remote-controller -![Version: 1.0.5](https://img.shields.io/badge/Version-1.0.5-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square) +![Version: 1.0.6](https://img.shields.io/badge/Version-1.0.6-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square) A Helm chart to deploy the terraform-operator-remote-controller @@ -16,7 +16,7 @@ $ helm install terraform-operator-remote-controller galleybytes/terraform-operat | Key | Description | Default | |---|---|---| | image | `object` image repository and tag | `{"repository":"ghcr.io/galleybytes/terraform-operator-remote-controller","tag":"1.1.0"}` | -| 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.21/#envvar-v1-core. Values can be tpl ie `{{ .Values.CLIENT_NAME }}` where `CLIENT_NAME` can be defined elsewhere. | `[]` | | resources | `object` CPU/Memory request and limit configuration | `{"limits":{"cpu":"50m","memory":"32M"},"requests":{"cpu":"5m","memory":"32M"}}` | | nodeSelector | `object` node labels for pod assignment | `{}` | | tolerations | `list` List of node taints to tolerate | `[]` | diff --git a/charts/terraform-operator-remote-controller/templates/deployment.yaml b/charts/terraform-operator-remote-controller/templates/deployment.yaml index 9ca21ff..a4dcb14 100644 --- a/charts/terraform-operator-remote-controller/templates/deployment.yaml +++ b/charts/terraform-operator-remote-controller/templates/deployment.yaml @@ -38,7 +38,7 @@ spec: {{- end }} env: {{- if .Values.env }} - {{- .Values.env | toYaml | nindent 8 }} + {{- tpl (.Values.env | toYaml | nindent 8) . }} {{- end }} {{- if .Values.data.vcluster.enabled }} - name: TFO_API_VCLUSTER_MANIFEST diff --git a/charts/terraform-operator-remote-controller/values.yaml b/charts/terraform-operator-remote-controller/values.yaml index 51a287f..7fb7cec 100644 --- a/charts/terraform-operator-remote-controller/values.yaml +++ b/charts/terraform-operator-remote-controller/values.yaml @@ -4,6 +4,7 @@ image: tag: 1.1.0 # -- Env defined like k8s EnvVar https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#envvar-v1-core. +# Values can be tpl ie `{{ .Values.CLIENT_NAME }}` where `CLIENT_NAME` can be defined elsewhere. env: [] # - name: CLIENT_NAME # value: cluster-x