From 29f0dd5910fc5a7dec5f57d791f6daccc2fed808 Mon Sep 17 00:00:00 2001
From: rhysm <rhysm@users.noreply.github.com>
Date: Tue, 28 May 2019 21:37:55 +1200
Subject: [PATCH] [stable/spinnaker] Add support for adding env vars to Halyard
 (#13356)

Environment variables such as DEFAULT_JVM_OPTS need to be set in order
for Halyard to use a proxy. This adds an option to let you pass through
any env vars to the Halyard pod.

Signed-off-by: Rhys Meaclem <rhysmeaclem@gmail.com>
---
 stable/spinnaker/Chart.yaml                          | 2 +-
 stable/spinnaker/README.md                           | 9 +++++++++
 stable/spinnaker/templates/statefulsets/halyard.yaml | 4 ++++
 stable/spinnaker/values.yaml                         | 5 +++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index d623148069..e3f764aa62 100644
--- a/stable/spinnaker/Chart.yaml
+++ b/stable/spinnaker/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
 name: spinnaker
-version: 1.10.2
+version: 1.11.0
 appVersion: 1.12.5
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/README.md b/stable/spinnaker/README.md
index 6bedd38b20..cf28ee39f6 100644
--- a/stable/spinnaker/README.md
+++ b/stable/spinnaker/README.md
@@ -163,3 +163,12 @@ halyard:
   annotations:
     iam.amazonaws.com/role: <role_arn>
 ```
+
+### Set environment variables on the halyard pod
+
+```yaml
+halyard:
+  env:
+    - name: DEFAULT_JVM_OPTS
+      value: -Dhttp.proxyHost=proxy.example.com
+```
diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml
index 5ddd15e267..fcc6683867 100644
--- a/stable/spinnaker/templates/statefulsets/halyard.yaml
+++ b/stable/spinnaker/templates/statefulsets/halyard.yaml
@@ -139,6 +139,10 @@ spec:
           mountPath: /opt/halyard/config
         - name: reg-secrets
           mountPath: /opt/registry/passwords
+        {{- if .Values.halyard.env }}
+        env:
+{{ toYaml .Values.halyard.env | indent 8 }}
+        {{- end }}
   volumeClaimTemplates:
   - metadata:
       name: halyard-home
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index c6694f319f..dd95792afb 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -71,6 +71,11 @@ halyard:
     #   memory: "2Gi"
     #   cpu: "200m"
 
+  ## Uncomment if you want to set environment variables on the Halyard pod.
+  # env:
+  #   - name: DEFAULT_JVM_OPTS
+  #     value: -Dhttp.proxyHost=proxy.example.com
+
 # Define which registries and repositories you want available in your
 # Spinnaker pipeline definitions
 # For more info visit: