feat: sentry 20.10.1 (#211)

sentry-kubernetes · Oct 26, 2020 · cb9c844 · cb9c844
1 parent 0179c79
commit cb9c844
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 6.2.1
-appVersion: 20.9.0
+version: 7.0.0
+appVersion: 20.10.1
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami

diff --git a/sentry/templates/configmap-sentry.yaml b/sentry/templates/configmap-sentry.yaml
@@ -377,13 +377,6 @@ data:
     SENTRY_OPTIONS['mail.host'] = os.getenv("SENTRY_EMAIL_HOST", "{{ .Values.mail.host }}")
     SENTRY_OPTIONS['mail.from'] = os.getenv("SENTRY_EMAIL_FROM", "{{ .Values.mail.from }}")
 
-    ######################
-    # GitHub Integration #
-    #####################
-
-    GITHUB_APP_ID = '{{ .Values.githubSso.clientId }}'
-    GITHUB_API_SECRET = '{{ .Values.githubSso.clientSecret }}'
-
     #########################
     # Bitbucket Integration #
     ########################

diff --git a/sentry/templates/deployment-sentry-cron.yaml b/sentry/templates/deployment-sentry-cron.yaml
@@ -14,7 +14,7 @@ spec:
         app: {{ template "sentry.fullname" . }}
         release: "{{ .Release.Name }}"
         role: cron
-  replicas: 1
+  replicas: {{ .Values.sentry.cron.replicas }}
   template:
     metadata:
       annotations:

diff --git a/sentry/templates/deployment-snuba-replacer.yaml b/sentry/templates/deployment-snuba-replacer.yaml
@@ -18,7 +18,7 @@ spec:
         app: {{ template "sentry.fullname" . }}
         release: "{{ .Release.Name }}"
         role: snuba-replacer
-  replicas: 1
+  replicas: {{ .Values.snuba.replacer.replicas }}
   template:
     metadata:
       annotations:

diff --git a/sentry/templates/hooks/snuba-migrate.job.yaml b/sentry/templates/hooks/snuba-migrate.job.yaml
@@ -48,13 +48,13 @@ spec:
             {{- if .Values.clickhouse.enabled }}
             for ((i=0;i<{{ .Values.clickhouse.clickhouse.replicas }};i++)); do
               export CLICKHOUSE_HOST={{ $clickhouseHost }}-$i.{{ $clickhouseHost }}-headless;
-              snuba migrate;
+              snuba migrations migrate --force;
               export CLICKHOUSE_HOST={{ $clickhouseHost }}-replica-$i.{{ $clickhouseHost }}-replica-headless;
-              snuba migrate;
+              snuba migrations migrate --force;
             done
             {{- else }}
             export CLICKHOUSE_HOST={{ $clickhouseHost }};
-            snuba migrate;
+            snuba migrations migrate --force;
             {{- end }}
         env:
         - name: LOG_LEVEL

diff --git a/sentry/values.yaml b/sentry/values.yaml
@@ -35,7 +35,7 @@ images:
 
 relay:
   replicas: 1
-  # mode: managed
+  mode: proxy
   env: []
   probeInitialDelaySeconds: 10
   resources: {}
@@ -110,6 +110,7 @@ sentry:
       targetCPUUtilizationPercentage: 50
 
   cron:
+    replicas: 1
     env: []
     resources: {}
     affinity: {}
@@ -147,6 +148,9 @@ snuba:
       maxReplicas: 5
       targetCPUUtilizationPercentage: 50
 
+  replacer:
+    replicas: 1
+
   consumer:
     replicas: 1
     env: []
@@ -281,10 +285,6 @@ github: {} # https://github.com/settings/apps (Create a Github App)
 #   privateKey: "-----BEGIN RSA PRIVATE KEY-----\nMIIEpA" !!!! Don't forget a trailing \n
 #   webhookSecret:  "xxxxx`"
 
-githubSso: {} # https://github.com/settings/developers (Create a OAuth App)
-  # clientId: "xx"
-  # clientSecret: "xx"
-
 slack: {}
 # slack:
 #   clientId: