From a7ca70668d866d01229dab2545986d6e6990ddb8 Mon Sep 17 00:00:00 2001
From: ronnym <4402931+RonnyMaas@users.noreply.github.com>
Date: Tue, 8 Oct 2019 13:21:12 +0200
Subject: [PATCH] =?UTF-8?q?[stable/rocketchat]=20Added=20new=20vars=20to?=
 =?UTF-8?q?=20values.yaml=20and=20changed=20templates/deployment.yaml=20f?=
 =?UTF-8?q?=E2=80=A6=20(#17776)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added new vars to values.yaml and changed templates/deployment.yaml for optional extra pod labels and annotions for Rocket.Chat pods

Signed-off-by: RonnyMaas <r.maas3@chello.nl>

* bump chart version to 1.1.15

Signed-off-by: RonnyMaas <r.maas3@chello.nl>

* added starting space for comments

Signed-off-by: RonnyMaas <r.maas3@chello.nl>
---
 stable/rocketchat/Chart.yaml                | 2 +-
 stable/rocketchat/README.md                 | 2 ++
 stable/rocketchat/templates/deployment.yaml | 9 +++++++++
 stable/rocketchat/values.yaml               | 9 +++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/stable/rocketchat/Chart.yaml b/stable/rocketchat/Chart.yaml
index 749428cb6b..1ed6478dad 100644
--- a/stable/rocketchat/Chart.yaml
+++ b/stable/rocketchat/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rocketchat
-version: 1.1.14
+version: 1.1.15
 appVersion: 1.3.1
 description: Prepare to take off with the ultimate chat platform, experience the next level of team communications
 keywords:
diff --git a/stable/rocketchat/README.md b/stable/rocketchat/README.md
index 84c7e5da75..de7060b2c6 100644
--- a/stable/rocketchat/README.md
+++ b/stable/rocketchat/README.md
@@ -80,6 +80,8 @@ Parameter | Description | Default
 `service.type` | The service type to use | `ClusterIP`
 `service.port` | The service port | `80`
 `service.nodePort` | The node port used if the service is of type `NodePort` | `""`
+`podLabels` | Additional pod labels for the Rocket.Chat pods | `{}`
+`podAnnotations` | Additional pod annotations for the Rocket.Chat pods | `{}`
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 
diff --git a/stable/rocketchat/templates/deployment.yaml b/stable/rocketchat/templates/deployment.yaml
index 5d18c9efcb..07bb289bbe 100644
--- a/stable/rocketchat/templates/deployment.yaml
+++ b/stable/rocketchat/templates/deployment.yaml
@@ -18,8 +18,17 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "rocketchat.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 8 }}
+        {{- end }}
+
       annotations:
         checksum/secret: {{ include (print .Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations | indent 8 }}
+        {{- end }}
+
+
     spec:
       {{- if .Values.securityContext.enabled }}
       securityContext:
diff --git a/stable/rocketchat/values.yaml b/stable/rocketchat/values.yaml
index fc9039f35a..f198e9016d 100644
--- a/stable/rocketchat/values.yaml
+++ b/stable/rocketchat/values.yaml
@@ -161,3 +161,12 @@ service:
   # nodePort: 30000
 
   port: 80
+
+## Optional Pod Labels.
+podLabels: {}
+
+## Optional Pod Annotations.
+podAnnotations: {}
+  # prometheus.io/port: "9458"
+  # prometheus.io/path: "/metrics"
+  # prometheus.io/scrape: "true"