From 6871747c2eddd6c1b0cff4f666fa8d0d44cffc66 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jja@ibm.com>
Date: Thu, 15 Aug 2019 15:04:47 -0500
Subject: [PATCH] [stable/spinnaker] This allows for ephemeral halyard
 deployments (#16301)

* [stable/spinnaker] This allows for ephemeral halyard deployments

This give you the ability to deploy to clusters without pvc support.

Co-authored-by: Paul Czarkowski <pczarkowski@pivotal.io>
Co-authored-by: JJ Asghar <awesome@ibm.com>
Signed-off-by: JJ Asghar <awesome@ibm.com>
Signed-off-by: JJ Asghar <jjasghar@gmail.com>

* Updated the Chart.yaml per the contrib docs

Signed-off-by: JJ Asghar <awesome@ibm.com>
Signed-off-by: JJ Asghar <jjasghar@gmail.com>
---
 stable/spinnaker/Chart.yaml                          | 2 +-
 stable/spinnaker/templates/statefulsets/halyard.yaml | 6 ++++++
 stable/spinnaker/values.yaml                         | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index 47e0672316..1661d7a3df 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.14.1
+version: 1.15.0
 appVersion: 1.12.5
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml
index 572b6eb30c..56d1486f4f 100644
--- a/stable/spinnaker/templates/statefulsets/halyard.yaml
+++ b/stable/spinnaker/templates/statefulsets/halyard.yaml
@@ -52,6 +52,10 @@ spec:
           name: cacerts
         {{- end }}
       volumes:
+      {{- if not .Values.halyard.persistence.enabled }}
+      - name: halyard-home
+        emptyDir: {}
+      {{- end }}
       {{- if .Values.kubeConfig.enabled }}
       - name: kube-config
         secret:
@@ -161,6 +165,7 @@ spec:
           subPath: cacerts
           name: cacerts
         {{- end }}
+{{- if .Values.halyard.persistence.enabled }}
   volumeClaimTemplates:
   - metadata:
       name: halyard-home
@@ -171,3 +176,4 @@ spec:
       resources:
         requests:
           storage: 10Gi
+{{- end }}
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index 15394433e5..c6c79a8d36 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -3,6 +3,9 @@ halyard:
   image:
     repository: gcr.io/spinnaker-marketplace/halyard
     tag: 1.20.2
+  # Set to false to disable persistence data volume for halyard
+  persistence:
+    enabled: true
   # Provide a config map with Hal commands that will be run the core config (storage)
   # The config map should contain a script in the config.sh key
   additionalScripts: