From 652cf09c38ab6faab7c11680f9e2f0da0e7a9c01 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Fri, 17 May 2019 12:46:05 +0200
Subject: [PATCH] [stable/spinnaker] Add a support of halyard resource
 definitions (#12941)

* [stable/spinnaker] Add a support of halyard resource definitions

Signed-off-by: Mikhail Zholobov <legal90@gmail.com>

* [stable/spinnaker] Bump chart version

Signed-off-by: Mikhail Zholobov <legal90@gmail.com>
---
 stable/spinnaker/Chart.yaml                          |  2 +-
 stable/spinnaker/templates/statefulsets/halyard.yaml |  4 ++++
 stable/spinnaker/values.yaml                         | 10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index 130230ae65..845864c961 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.9.1
+version: 1.9.2
 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 9e7834bf3a..5ddd15e267 100644
--- a/stable/spinnaker/templates/statefulsets/halyard.yaml
+++ b/stable/spinnaker/templates/statefulsets/halyard.yaml
@@ -108,6 +108,10 @@ spec:
         ports:
         - containerPort: 8064
           name: daemon
+        {{- if .Values.halyard.resources }}
+        resources:
+{{ toYaml .Values.halyard.resources | indent 10 }}
+        {{- end }}
         volumeMounts:
         {{- if .Values.gcs.enabled }}
         - name: gcs-key
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index e32f00647e..3dccea834b 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -45,6 +45,16 @@ halyard:
   # annotations:
   #   iam.amazonaws.com/role: <role_arn>
 
+  ## Uncomment the following resources definitions to control the cpu and memory
+  # resources allocated for the halyard pod
+  resources: {}
+    # requests:
+    #   memory: "1Gi"
+    #   cpu: "100m"
+    # limits:
+    #   memory: "2Gi"
+    #   cpu: "200m"
+
 # Define which registries and repositories you want available in your
 # Spinnaker pipeline definitions
 # For more info visit: