From 0c33e5860c8f8cfd59099cb81af6aad14cb767a3 Mon Sep 17 00:00:00 2001 From: Alessandro Chitolina Date: Fri, 21 May 2021 14:51:56 +0200 Subject: [PATCH] upgrade sentry to 21.5.1 --- sentry/Chart.yaml | 4 ++-- sentry/templates/_helper.tpl | 10 ++++++++++ sentry/templates/configmap-snuba.yaml | 3 --- sentry/templates/deployment-snuba-api.yaml | 5 ++--- sentry/templates/deployment-snuba-consumer.yaml | 3 +-- .../templates/deployment-snuba-outcomes-consumer.yaml | 3 +-- sentry/templates/deployment-snuba-replacer.yaml | 3 +-- .../templates/deployment-snuba-sessions-consumer.yaml | 3 +-- .../deployment-snuba-transactions-consumer.yaml | 3 +-- sentry/templates/hooks/snuba-db-init.job.yaml | 3 +-- sentry/templates/hooks/snuba-migrate.job.yaml | 3 +-- 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml index 6ea3b247b..a68effb97 100644 --- 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: 11.2.2 -appVersion: 21.4.1 +version: 11.3.0 +appVersion: 21.5.1 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami diff --git a/sentry/templates/_helper.tpl b/sentry/templates/_helper.tpl index e58b41076..f2de190c2 100644 --- a/sentry/templates/_helper.tpl +++ b/sentry/templates/_helper.tpl @@ -365,3 +365,13 @@ Set RabbitMQ host {{ .Values.rabbitmq.host }} {{- end -}} {{- end -}} + +{{/* +Common Snuba environment variables +*/}} +{{- define "sentry.snuba.env" -}} +- name: SNUBA_SETTINGS + value: /etc/snuba/settings.py +- name: DEFAULT_BROKERS + value: {{ printf "%s:%s" (include "sentry.kafka.host" .) (include "sentry.kafka.port" .) | quote }} +{{- end -}} diff --git a/sentry/templates/configmap-snuba.yaml b/sentry/templates/configmap-snuba.yaml index 55dae05df..deec4b4b4 100644 --- a/sentry/templates/configmap-snuba.yaml +++ b/sentry/templates/configmap-snuba.yaml @@ -36,7 +36,4 @@ data: {{- end }} REDIS_DB = int(env("REDIS_DB", 1)) - # Processor/Writer Options - DEFAULT_BROKERS = [{{ printf "%s:%s" (include "sentry.kafka.host" .) (include "sentry.kafka.port" .) | quote }}] - {{ .Values.config.snubaSettingsPy | indent 4 }} diff --git a/sentry/templates/deployment-snuba-api.yaml b/sentry/templates/deployment-snuba-api.yaml index a35f409b0..8e668e0d9 100644 --- a/sentry/templates/deployment-snuba-api.yaml +++ b/sentry/templates/deployment-snuba-api.yaml @@ -60,8 +60,7 @@ spec: ports: - containerPort: {{ template "snuba.port" }} env: - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.api.env }} {{ toYaml .Values.snuba.api.env | indent 8 }} {{- end }} @@ -103,4 +102,4 @@ spec: name: {{ template "sentry.fullname" . }}-snuba {{- if .Values.snuba.api.volumes }} {{ toYaml .Values.snuba.api.volumes | indent 8 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml index 24c2a9bc4..3ff2d18e1 100644 --- a/sentry/templates/deployment-snuba-consumer.yaml +++ b/sentry/templates/deployment-snuba-consumer.yaml @@ -68,8 +68,7 @@ spec: ports: - containerPort: {{ template "snuba.port" }} env: - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.consumer.env }} {{ toYaml .Values.snuba.consumer.env | indent 8 }} {{- end }} diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml index 43ab7f894..76490e387 100644 --- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml +++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml @@ -68,8 +68,7 @@ spec: ports: - containerPort: {{ template "snuba.port" }} env: - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.outcomesConsumer.env }} {{ toYaml .Values.snuba.outcomesConsumer.env | indent 8 }} {{- end }} diff --git a/sentry/templates/deployment-snuba-replacer.yaml b/sentry/templates/deployment-snuba-replacer.yaml index a67a8754a..4b9bdfaf0 100644 --- a/sentry/templates/deployment-snuba-replacer.yaml +++ b/sentry/templates/deployment-snuba-replacer.yaml @@ -68,8 +68,7 @@ spec: ports: - containerPort: {{ template "snuba.port" }} env: - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.replacer.env }} {{ toYaml .Values.snuba.replacer.env | indent 8 }} {{- end }} diff --git a/sentry/templates/deployment-snuba-sessions-consumer.yaml b/sentry/templates/deployment-snuba-sessions-consumer.yaml index b64b905c2..33dc17e1d 100644 --- a/sentry/templates/deployment-snuba-sessions-consumer.yaml +++ b/sentry/templates/deployment-snuba-sessions-consumer.yaml @@ -68,8 +68,7 @@ spec: ports: - containerPort: {{ template "snuba.port" }} env: - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.sessionsConsumer.env }} {{ toYaml .Values.snuba.sessionsConsumer.env | indent 8 }} {{- end }} diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml index 27c197498..360f92b10 100644 --- a/sentry/templates/deployment-snuba-transactions-consumer.yaml +++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml @@ -68,8 +68,7 @@ spec: ports: - containerPort: {{ template "snuba.port" }} env: - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.transactionsConsumer.env }} {{ toYaml .Values.snuba.transactionsConsumer.env | indent 8 }} {{- end }} diff --git a/sentry/templates/hooks/snuba-db-init.job.yaml b/sentry/templates/hooks/snuba-db-init.job.yaml index f08f3da40..b403dd0f6 100644 --- a/sentry/templates/hooks/snuba-db-init.job.yaml +++ b/sentry/templates/hooks/snuba-db-init.job.yaml @@ -64,10 +64,9 @@ spec: env: - name: LOG_LEVEL value: debug - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py - name: CLICKHOUSE_SINGLE_NODE value: "true" +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.dbInitJob.env }} {{ toYaml .Values.snuba.dbInitJob.env | indent 8 }} {{- end }} diff --git a/sentry/templates/hooks/snuba-migrate.job.yaml b/sentry/templates/hooks/snuba-migrate.job.yaml index 46d06cd74..185d0c417 100644 --- a/sentry/templates/hooks/snuba-migrate.job.yaml +++ b/sentry/templates/hooks/snuba-migrate.job.yaml @@ -64,10 +64,9 @@ spec: env: - name: LOG_LEVEL value: debug - - name: SNUBA_SETTINGS - value: /etc/snuba/settings.py - name: CLICKHOUSE_SINGLE_NODE value: "true" +{{ include "sentry.snuba.env" . | indent 8 }} {{- if .Values.snuba.migrateJob.env }} {{ toYaml .Values.snuba.migrateJob.env | indent 8 }} {{- end }}