From b41549204269b22c7fdeb1e16a653a21175acda5 Mon Sep 17 00:00:00 2001
From: Craig Mulligan <hobochildster@gmail.com>
Date: Thu, 7 Jun 2018 19:38:29 +0100
Subject: [PATCH] [incubator/sentry-kubernetes] Add release/environment values
 (#5952)

* Add release/environment values to sentry-kubernetes

This allows you to customize settings here: https://github.com/getsentry/sentry-kubernetes/blob/master/sentry-kubernetes.py#L27-#L28

* use k8s metadata to set Release envar

* fix markdown
---
 incubator/sentry-kubernetes/Chart.yaml          |  2 +-
 incubator/sentry-kubernetes/README.md           | 17 +++++++++--------
 .../sentry-kubernetes/templates/deployment.yaml |  7 +++++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/incubator/sentry-kubernetes/Chart.yaml b/incubator/sentry-kubernetes/Chart.yaml
index 5e517dd20a..f278d40191 100644
--- a/incubator/sentry-kubernetes/Chart.yaml
+++ b/incubator/sentry-kubernetes/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for sentry-kubernetes (https://github.com/getsentry/sentry-kubernetes)
 name: sentry-kubernetes
-version: 0.1.4
+version: 0.1.5
 appVersion: latest
 home: https://github.com/getsentry/sentry-kubernetes
 sources:
diff --git a/incubator/sentry-kubernetes/README.md b/incubator/sentry-kubernetes/README.md
index 2143cdafbd..b9e1473254 100644
--- a/incubator/sentry-kubernetes/README.md
+++ b/incubator/sentry-kubernetes/README.md
@@ -12,11 +12,12 @@ $ helm install incubator/sentry-kubernetes --name my-release --set sentry.dsn=<y
 
 The following table lists the configurable parameters of the sentry-kubernetes chart and their default values.
 
-|       Parameter         |           Description               |                         Default                     |
-|-------------------------|-------------------------------------|-----------------------------------------------------|
-| `sentry.dsn`            | Sentry dsn                          | Empty                                               |
-| `image.repository`      | Container image name                | `getsentry/sentry-kubernetes`                       |
-| `image.tag    `         | Container image tag                 | `latest`                                            |
-| `rbac.create`                        | If `true`, create and use RBAC resources	 | `true`|
-| `serviceAccount.name` | Service account to be used. If not set and serviceAccount.create is `true`, a name is generated using the fullname template	| ``    
-| `serviceAccount.create` | If true, create a new service account	| `true`    
+| Parameter               | Description                                                                                                                 | Default                       |
+| ----------------------- | --------------------------------------------------------------------------------------------------------------------------- | ----------------------------- |
+| `sentry.dsn`            | Sentry dsn                                                                                                                  | Empty                         |
+| `sentry.environment`    | Sentry environment                                                                                                          | Empty                         |
+| `image.repository`      | Container image name                                                                                                        | `getsentry/sentry-kubernetes` |
+| `image.tag`             | Container image tag                                                                                                         | `latest`                      |
+| `rbac.create`           | If `true`, create and use RBAC resources                                                                                    | `true`                        |
+| `serviceAccount.name`   | Service account to be used. If not set and serviceAccount.create is `true`, a name is generated using the fullname template | ``                            |
+| `serviceAccount.create` | If true, create a new service account                                                                                       | `true`                        |
diff --git a/incubator/sentry-kubernetes/templates/deployment.yaml b/incubator/sentry-kubernetes/templates/deployment.yaml
index 87c2409036..58859883f4 100644
--- a/incubator/sentry-kubernetes/templates/deployment.yaml
+++ b/incubator/sentry-kubernetes/templates/deployment.yaml
@@ -26,6 +26,13 @@ spec:
               secretKeyRef:
                 name: {{ template "sentry-kubernetes.fullname" . }}
                 key: sentry.dsn
+          - name: ENVIRONMENT
+            value: {{ .Values.sentry.environment }}
+          - name: RELEASE
+            valueFrom:
+              resourceFieldRef:
+                containerName: {{ .Chart.Name }}
+                resource: image
         resources:
 {{ toYaml .Values.resources | indent 10 }}
     {{- if .Values.nodeSelector }}