From 5946d975a4ab77dc6ab72dc66609f2c87b81e41a Mon Sep 17 00:00:00 2001
From: Kohei Morita <mrtc0@ssrf.in>
Date: Wed, 22 Jul 2020 15:46:47 +0900
Subject: [PATCH 1/4] add regacyApp field for slack

---
 sentry/templates/configmap-sentry.yaml | 3 +++
 sentry/values.yaml                     | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sentry/templates/configmap-sentry.yaml b/sentry/templates/configmap-sentry.yaml
index 13ab99dae..0726c6e42 100644
--- a/sentry/templates/configmap-sentry.yaml
+++ b/sentry/templates/configmap-sentry.yaml
@@ -48,6 +48,9 @@ data:
     slack.client-id: "{{ .Values.slack.clientId }}"
     slack.client-secret: "{{ .Values.slack.clientSecret }}"
     slack.verification-token: "{{ .Values.slack.verificationToken }}"
+    {{- if .Values.slack.legacyApp }}
+    slack.legacy-app: "{{ .Values.slack.legacyApp }}"
+    {{ end }}
     {{ end }}
 
     ################
diff --git a/sentry/values.yaml b/sentry/values.yaml
index f79eb9cc4..8b98d658d 100644
--- a/sentry/values.yaml
+++ b/sentry/values.yaml
@@ -192,6 +192,7 @@ slack: {}
 #   clientId:
 #   clientSecret:
 #   verificationToken:
+#   legacyApp:
 
 ingress:
   enabled: false
@@ -444,4 +445,4 @@ metrics:
     # namespaceSelector:
     #   any: true
     scrapeInterval: 30s
-    # honorLabels: true
\ No newline at end of file
+    # honorLabels: true

From 47985b955e5bdbde182d9a9aa776d71b681086d0 Mon Sep 17 00:00:00 2001
From: Kohei Morita <mrtc0@ssrf.in>
Date: Wed, 22 Jul 2020 18:05:45 +0900
Subject: [PATCH 2/4] use boolean

---
 sentry/templates/configmap-sentry.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry/templates/configmap-sentry.yaml b/sentry/templates/configmap-sentry.yaml
index 0726c6e42..bdbe357b2 100644
--- a/sentry/templates/configmap-sentry.yaml
+++ b/sentry/templates/configmap-sentry.yaml
@@ -49,7 +49,7 @@ data:
     slack.client-secret: "{{ .Values.slack.clientSecret }}"
     slack.verification-token: "{{ .Values.slack.verificationToken }}"
     {{- if .Values.slack.legacyApp }}
-    slack.legacy-app: "{{ .Values.slack.legacyApp }}"
+    slack.legacy-app: {{ .Values.slack.legacyApp }}
     {{ end }}
     {{ end }}
 

From 66153af2bea45063ce127f0fa3eb23053e134327 Mon Sep 17 00:00:00 2001
From: Kohei Morita <mrtc0@ssrf.in>
Date: Wed, 22 Jul 2020 18:13:19 +0900
Subject: [PATCH 3/4] add comment for slack api deprecated issue reference

---
 sentry/values.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sentry/values.yaml b/sentry/values.yaml
index 8b98d658d..43b62db68 100644
--- a/sentry/values.yaml
+++ b/sentry/values.yaml
@@ -192,6 +192,10 @@ slack: {}
 #   clientId:
 #   clientSecret:
 #   verificationToken:
+#   # channels.* of Slack API is deprecated.
+#   # All new slack apps created after June 10th, 2020 will give error,
+#   # you need to specify `False` if you want to use the Slack App created after that.
+#   # ref : https://github.com/getsentry/sentry/pull/19446
 #   legacyApp:
 
 ingress:

From b8a741e63613cc7aef897072ae15ad82b88d7d35 Mon Sep 17 00:00:00 2001
From: Kohei Morita <mrtc0@ssrf.in>
Date: Wed, 22 Jul 2020 21:58:35 +0900
Subject: [PATCH 4/4] setting a value even if specify a true or false value

---
 sentry/templates/configmap-sentry.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sentry/templates/configmap-sentry.yaml b/sentry/templates/configmap-sentry.yaml
index bdbe357b2..0df1db62d 100644
--- a/sentry/templates/configmap-sentry.yaml
+++ b/sentry/templates/configmap-sentry.yaml
@@ -49,7 +49,9 @@ data:
     slack.client-secret: "{{ .Values.slack.clientSecret }}"
     slack.verification-token: "{{ .Values.slack.verificationToken }}"
     {{- if .Values.slack.legacyApp }}
-    slack.legacy-app: {{ .Values.slack.legacyApp }}
+    slack.legacy-app: True
+    {{- else }}
+    slack.legacy-app: False
     {{ end }}
     {{ end }}