Merge pull request #15 from rsvalerio/add_raw_envvars

Add support to define env vars in raw yaml notation
runatlantis · Jan 13, 2021 · 62da7f3 · 62da7f3
2 parents 3cb9877 + 07fb4e7
commit 62da7f3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/charts/atlantis/Chart.yaml b/charts/atlantis/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v0.16.0
 description: A Helm chart for Atlantis https://www.runatlantis.io
 name: atlantis
-version: 3.12.8
+version: 3.12.9
 keywords:
 - terraform
 home: https://www.runatlantis.io

diff --git a/charts/atlantis/README.md b/charts/atlantis/README.md
@@ -50,7 +50,8 @@ The following options are supported.  See [values.yaml](values.yaml) for more de
 | `bitbucket.secret`                          | Webhook secret for Bitbucket repositories (Bitbucket Server only).                                                                                                                                                                                                                                        | n/a     |
 | `bitbucket.baseURL`                         | Base URL of Bitbucket Server installation.                                                                                                                                                                                                                                                                | n/a     |
 | `environment`                               | Map of environment variables for the container.                                                                                                                                                                                                                                                           | `{}`    |
-| `environmentSecrets`                         | Array of Kubernetes secrets that can be used to set environment variables. See `values.yaml` for example.                                                                                                                                                                                                                                                          | `{}`    |
+| `environmentSecrets`                        | Array of Kubernetes secrets that can be used to set environment variables. See `values.yaml` for example.                                                                                                                                                                                                 | `{}`    |
+| `environmentRaw`                            | Array environment variables in plain Kubernetes yaml format. See `values.yaml` for example.                                                                                                                                                                                                               | `[]`    |
 | `loadEnvFromSecrets`                        | Array of Kubernetes secrets to set all key-value pairs as environment variables. See `values.yaml` for example.                                                                                                                                                                                           | `[]`    |
 | `extraVolumes`                              | List of additional volumes available to the pod.                                                                                                                                                                                                                                                          | `[]`    |
 | `extraVolumeMounts`                         | List of additional volumes mounted to the container.                                                                                                                                                                                                                                                      | `[]`    |

diff --git a/charts/atlantis/templates/statefulset.yaml b/charts/atlantis/templates/statefulset.yaml
@@ -124,6 +124,11 @@ spec:
           {{- end }}
           {{- end }}
           env:
+          {{- if .Values.environmentRaw }}
+          {{- with .Values.environmentRaw }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          {{- end }}
           {{- range $key, $value := .Values.environment }}
           - name: {{ $key }}
             value: {{ $value | quote }}

diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
@@ -220,6 +220,15 @@ environmentSecrets: []
 #       name: the_k8s_secret_name
 #       key: the_key_of_the_value_in_the_secret
 
+# Optionally specify additional environment variables in raw yaml format
+# Useful to specify variables refering to k8s objects
+# environmentRaw:
+#   - name: POD_IP
+#     valueFrom:
+#       fieldRef:
+#         fieldPath: status.podIP
+environmentRaw: []
+
 # Optionally specify additional Kubernetes secrets to load environment variables from.
 # All key-value pairs within these secrets will be set as environment variables.
 # Note that any variables set here will be ignored if also defined in the env block of the atlantis statefulset.