From ac8143fd1607c0493ea5c60940be3e649f6d613b Mon Sep 17 00:00:00 2001 From: Yahia Berchi Date: Wed, 4 Dec 2024 11:16:12 +0100 Subject: [PATCH] feat: Add missing sidecar and global parameter for deployments & hooks (#1230) --- .../sentry/templates/hooks/sentry-db-check.job.yaml | 13 ++++++++++++- .../sentry/templates/hooks/sentry-db-init.job.yaml | 6 ++++++ .../sentry/templates/hooks/snuba-db-init.job.yaml | 9 +++++++++ .../sentry/templates/hooks/snuba-migrate.job.yaml | 9 +++++++++ charts/sentry/templates/hooks/user-create.yaml | 9 +++++++++ charts/sentry/templates/relay/deployment-relay.yaml | 6 ++++++ .../sentry/cleanup/cronjob-sentry-cleanup.yaml | 6 ++++++ .../sentry/cron/deployment-sentry-cron.yaml | 6 ++++++ ...ployment-sentry-ingest-consumer-attachments.yaml | 10 ++++++++-- .../deployment-sentry-ingest-consumer-events.yaml | 6 ++++++ .../monitors/deployment-sentry-ingest-monitors.yaml | 6 ++++++ .../deployment-sentry-ingest-occurrences.yaml | 6 ++++++ .../profiles/deployment-sentry-ingest-profiles.yaml | 6 ++++++ .../deployment-sentry-ingest-replay-recordings.yaml | 6 ++++++ .../deployment-sentry-billing-metrics-consumer.yaml | 6 ++++++ .../sentry/metrics/deployment-metrics.yaml | 13 ++++++++++++- .../metrics/deployment-sentry-metrics-consumer.yaml | 6 ++++++ .../deployment-sentry-generic-metrics-consumer.yaml | 6 ++++++ ...oyment-sentry-post-process-forwarder-errors.yaml | 6 ++++++ ...entry-post-process-forwarder-issue-platform.yaml | 9 +++++++++ ...-sentry-post-process-forwarder-transactions.yaml | 6 ++++++ ...loyment-sentry-subscription-consumer-events.yaml | 6 ++++++ ...entry-subscription-consumer-generic-metrics.yaml | 6 ++++++ ...oyment-sentry-subscription-consumer-metrics.yaml | 6 ++++++ ...t-sentry-subscription-consumer-transactions.yaml | 6 ++++++ .../templates/sentry/vroom/deployment-vroom.yaml | 10 +++++++++- .../templates/sentry/web/deployment-sentry-web.yaml | 6 ++++++ .../sentry/worker/deployment-sentry-worker.yaml | 6 ++++++ .../templates/snuba/deployment-snuba-api.yaml | 6 ++++++ .../templates/snuba/deployment-snuba-consumer.yaml | 9 +++++++++ ...ent-snuba-generic-metrics-counters-consumer.yaml | 9 +++++++++ ...nuba-generic-metrics-distributions-consumer.yaml | 9 +++++++++ ...loyment-snuba-generic-metrics-sets-consumer.yaml | 9 +++++++++ .../deployment-snuba-group-attributes-consumer.yaml | 9 +++++++++ .../deployment-snuba-issue-occurrence-consumer.yaml | 9 +++++++++ .../snuba/deployment-snuba-metrics-consumer.yaml | 9 +++++++++ .../deployment-snuba-outcomes-billing-consumer.yaml | 9 +++++++++ .../snuba/deployment-snuba-outcomes-consumer.yaml | 9 +++++++++ ...ployment-snuba-profiling-functions-consumer.yaml | 9 +++++++++ ...eployment-snuba-profiling-profiles-consumer.yaml | 9 +++++++++ .../templates/snuba/deployment-snuba-replacer.yaml | 9 +++++++++ .../snuba/deployment-snuba-replays-consumer.yaml | 9 +++++++++ .../snuba/deployment-snuba-spans-consumer.yaml | 9 +++++++++ ...ployment-snuba-subscription-consumer-events.yaml | 9 +++++++++ ...loyment-snuba-subscription-consumer-metrics.yaml | 9 +++++++++ ...nt-snuba-subscription-consumer-transactions.yaml | 9 +++++++++ .../deployment-snuba-transactions-consumer.yaml | 9 +++++++++ .../symbolicator/deployment-symbolicator.yaml | 9 +++++++++ charts/sentry/values.yaml | 9 +++++++++ 49 files changed, 383 insertions(+), 5 deletions(-) diff --git a/charts/sentry/templates/hooks/sentry-db-check.job.yaml b/charts/sentry/templates/hooks/sentry-db-check.job.yaml index e8eb690cb..082c02bde 100644 --- a/charts/sentry/templates/hooks/sentry-db-check.job.yaml +++ b/charts/sentry/templates/hooks/sentry-db-check.job.yaml @@ -197,9 +197,20 @@ spec: securityContext: {{ toYaml .Values.hooks.dbCheck.containerSecurityContext | indent 10 }} {{- end }} -{{- if .Values.hooks.dbCheck.volumes }} +{{- if .Values.hooks.dbCheck.sidecars }} +{{ toYaml .Values.hooks.dbCheck.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} +{{- end }} +{{- if or .Values.hooks.dbCheck.volumes .Values.global.volumes }} volumes: +{{- if .Values.hooks.dbCheck.volumes }} {{ toYaml .Values.hooks.dbCheck.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} {{- if .Values.hooks.shareProcessNamespace }} shareProcessNamespace: {{ .Values.hooks.shareProcessNamespace }} diff --git a/charts/sentry/templates/hooks/sentry-db-init.job.yaml b/charts/sentry/templates/hooks/sentry-db-init.job.yaml index a25f0e906..cdc185bd2 100644 --- a/charts/sentry/templates/hooks/sentry-db-init.job.yaml +++ b/charts/sentry/templates/hooks/sentry-db-init.job.yaml @@ -103,6 +103,9 @@ spec: {{- end }} {{- if .Values.hooks.dbInit.sidecars }} {{ toYaml .Values.hooks.dbInit.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} volumes: - name: config @@ -110,6 +113,9 @@ spec: name: {{ template "sentry.fullname" . }}-sentry {{- if .Values.hooks.dbInit.volumes }} {{ toYaml .Values.hooks.dbInit.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.hooks.shareProcessNamespace }} shareProcessNamespace: {{ .Values.hooks.shareProcessNamespace }} diff --git a/charts/sentry/templates/hooks/snuba-db-init.job.yaml b/charts/sentry/templates/hooks/snuba-db-init.job.yaml index b52ba2da4..5ae8c3059 100644 --- a/charts/sentry/templates/hooks/snuba-db-init.job.yaml +++ b/charts/sentry/templates/hooks/snuba-db-init.job.yaml @@ -115,6 +115,12 @@ spec: {{- if .Values.hooks.snubaInit.containerSecurityContext }} securityContext: {{ toYaml .Values.hooks.snubaInit.containerSecurityContext | indent 10 }} +{{- end }} +{{- if .Values.hooks.snubaInit.sidecars }} +{{ toYaml .Values.hooks.snubaInit.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} volumes: - name: config @@ -122,6 +128,9 @@ spec: name: {{ template "sentry.fullname" . }}-snuba {{- if .Values.hooks.snubaInit.volumes }} {{ toYaml .Values.hooks.snubaInit.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.hooks.shareProcessNamespace }} shareProcessNamespace: {{ .Values.hooks.shareProcessNamespace }} diff --git a/charts/sentry/templates/hooks/snuba-migrate.job.yaml b/charts/sentry/templates/hooks/snuba-migrate.job.yaml index 275b1091a..323432bdc 100644 --- a/charts/sentry/templates/hooks/snuba-migrate.job.yaml +++ b/charts/sentry/templates/hooks/snuba-migrate.job.yaml @@ -106,6 +106,12 @@ spec: {{- if .Values.hooks.snubaMigrate.containerSecurityContext }} securityContext: {{ toYaml .Values.hooks.snubaMigrate.containerSecurityContext | indent 10 }} +{{- end }} +{{- if .Values.hooks.snubaMigrate.sidecars }} +{{ toYaml .Values.hooks.snubaMigrate.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} volumes: - name: config @@ -113,6 +119,9 @@ spec: name: {{ template "sentry.fullname" . }}-snuba {{- if .Values.hooks.snubaInit.volumes }} {{ toYaml .Values.hooks.snubaInit.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.hooks.shareProcessNamespace }} shareProcessNamespace: {{ .Values.hooks.shareProcessNamespace }} diff --git a/charts/sentry/templates/hooks/user-create.yaml b/charts/sentry/templates/hooks/user-create.yaml index 1c08c19d7..ad3bf7393 100644 --- a/charts/sentry/templates/hooks/user-create.yaml +++ b/charts/sentry/templates/hooks/user-create.yaml @@ -120,6 +120,12 @@ spec: {{- if .Values.hooks.dbInit.containerSecurityContext }} securityContext: {{ toYaml .Values.hooks.dbInit.containerSecurityContext | indent 10 }} +{{- end }} +{{- if .Values.hooks.dbInit.sidecars }} +{{ toYaml .Values.hooks.dbInit.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} volumes: - name: config @@ -127,6 +133,9 @@ spec: name: {{ template "sentry.fullname" . }}-sentry {{- if .Values.hooks.dbInit.volumes }} {{ toYaml .Values.hooks.dbInit.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.hooks.shareProcessNamespace }} shareProcessNamespace: {{ .Values.hooks.shareProcessNamespace }} diff --git a/charts/sentry/templates/relay/deployment-relay.yaml b/charts/sentry/templates/relay/deployment-relay.yaml index 17daeac79..c5384e32e 100644 --- a/charts/sentry/templates/relay/deployment-relay.yaml +++ b/charts/sentry/templates/relay/deployment-relay.yaml @@ -194,6 +194,9 @@ spec: {{- end }} {{- if .Values.relay.sidecars }} {{ toYaml .Values.relay.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-relay @@ -212,6 +215,9 @@ spec: {{- end }} {{- if .Values.relay.volumes }} {{ toYaml .Values.relay.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.relay.priorityClassName }} priorityClassName: "{{ .Values.relay.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/cleanup/cronjob-sentry-cleanup.yaml b/charts/sentry/templates/sentry/cleanup/cronjob-sentry-cleanup.yaml index aaa77ec37..50199afb4 100644 --- a/charts/sentry/templates/sentry/cleanup/cronjob-sentry-cleanup.yaml +++ b/charts/sentry/templates/sentry/cleanup/cronjob-sentry-cleanup.yaml @@ -111,6 +111,9 @@ spec: {{- end }} {{- if .Values.sentry.cleanup.sidecars }} {{ toYaml .Values.sentry.cleanup.sidecars | indent 10 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 10 }} {{- end }} restartPolicy: Never volumes: @@ -136,6 +139,9 @@ spec: {{ end }} {{- if .Values.sentry.cleanup.volumes }} {{ toYaml .Values.sentry.cleanup.volumes | indent 10 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 10 }} {{- end }} {{- if .Values.sentry.cleanup.priorityClassName }} priorityClassName: "{{ .Values.sentry.cleanup.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/cron/deployment-sentry-cron.yaml b/charts/sentry/templates/sentry/cron/deployment-sentry-cron.yaml index c46494e2e..57c0f47b9 100644 --- a/charts/sentry/templates/sentry/cron/deployment-sentry-cron.yaml +++ b/charts/sentry/templates/sentry/cron/deployment-sentry-cron.yaml @@ -114,6 +114,9 @@ spec: {{- end }} {{- if .Values.sentry.cron.sidecars }} {{ toYaml .Values.sentry.cron.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-cron @@ -141,6 +144,9 @@ spec: {{ end }} {{- if .Values.sentry.cron.volumes }} {{ toYaml .Values.sentry.cron.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.cron.priorityClassName }} priorityClassName: "{{ .Values.sentry.cron.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml b/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml index a9efeb59a..4f2e5917e 100644 --- a/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml +++ b/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml @@ -161,6 +161,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestConsumerAttachments.sidecars }} {{ toYaml .Values.sentry.ingestConsumerAttachments.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-consumer-attachments @@ -189,7 +192,10 @@ spec: {{- if .Values.sentry.ingestConsumerAttachments.volumes }} {{ toYaml .Values.sentry.ingestConsumerAttachments.volumes | indent 6 }} {{- end }} - {{- if .Values.sentry.ingestConsumerAttachments.priorityClassName }} - priorityClassName: "{{ .Values.sentry.ingestConsumerAttachments.priorityClassName }}" +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} + {{- if .Values.sentry.ingestConsumerEvents.priorityClassName }} + priorityClassName: "{{ .Values.sentry.ingestConsumerEvents.priorityClassName }}" {{- end }} {{- end }} diff --git a/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml b/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml index fda933f7a..33fa2e125 100644 --- a/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml +++ b/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml @@ -161,6 +161,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestConsumerEvents.sidecars }} {{ toYaml .Values.sentry.ingestConsumerEvents.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-consumer-events @@ -188,6 +191,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestConsumerEvents.volumes }} {{ toYaml .Values.sentry.ingestConsumerEvents.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestConsumerEvents.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumerEvents.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml b/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml index bba470a3b..606358149 100644 --- a/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml +++ b/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml @@ -140,6 +140,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestMonitors.sidecars }} {{ toYaml .Values.sentry.ingestMonitors.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-monitors @@ -167,6 +170,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestMonitors.volumes }} {{ toYaml .Values.sentry.ingestMonitors.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestMonitors.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestMonitors.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml b/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml index ec982f610..10963904e 100644 --- a/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml +++ b/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml @@ -140,6 +140,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestOccurrences.sidecars }} {{ toYaml .Values.sentry.ingestOccurrences.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-occurrences @@ -167,6 +170,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestOccurrences.volumes }} {{ toYaml .Values.sentry.ingestOccurrences.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestOccurrences.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestOccurrences.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml b/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml index 900d630f4..bc89b6dff 100644 --- a/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml +++ b/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml @@ -140,6 +140,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestProfiles.sidecars }} {{ toYaml .Values.sentry.ingestProfiles.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-profiles @@ -167,6 +170,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestProfiles.volumes }} {{ toYaml .Values.sentry.ingestProfiles.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestProfiles.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestProfiles.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml b/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml index 9dd2297bb..c1969c347 100644 --- a/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml +++ b/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml @@ -140,6 +140,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestReplayRecordings.sidecars }} {{ toYaml .Values.sentry.ingestReplayRecordings.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-replay-recordings @@ -167,6 +170,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestReplayRecordings.volumes }} {{ toYaml .Values.sentry.ingestReplayRecordings.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestReplayRecordings.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestReplayRecordings.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml index 6b67113b6..082453add 100644 --- a/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml +++ b/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml @@ -141,6 +141,9 @@ spec: {{- end }} {{- if .Values.sentry.billingMetricsConsumer.sidecars }} {{ toYaml .Values.sentry.billingMetricsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-billing-metrics-consumer @@ -168,6 +171,9 @@ spec: {{ end }} {{- if .Values.sentry.billingMetricsConsumer.volumes }} {{ toYaml .Values.sentry.billingMetricsConsumer.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.billingMetricsConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.billingMetricsConsumer.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/metrics/deployment-metrics.yaml b/charts/sentry/templates/sentry/metrics/deployment-metrics.yaml index 90aefbffe..2e20fe3fb 100644 --- a/charts/sentry/templates/sentry/metrics/deployment-metrics.yaml +++ b/charts/sentry/templates/sentry/metrics/deployment-metrics.yaml @@ -111,9 +111,20 @@ spec: securityContext: {{ toYaml .Values.metrics.containerSecurityContext | indent 10 }} {{- end }} -{{- if .Values.metrics.volumes }} +{{- if .Values.metrics.sidecars }} +{{ toYaml .Values.metrics.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} +{{- end }} +{{- if or .Values.metrics.volumes .Values.global.volumes }} volumes: +{{- if .Values.metrics.volumes }} {{ toYaml .Values.metrics.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} {{- if .Values.serviceAccount.enabled }} diff --git a/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml index 963fc1d48..17894a419 100644 --- a/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml +++ b/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml @@ -151,6 +151,9 @@ spec: {{- end }} {{- if .Values.sentry.metricsConsumer.sidecars }} {{ toYaml .Values.sentry.metricsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-metrics-consumer @@ -178,6 +181,9 @@ spec: {{ end }} {{- if .Values.sentry.metricsConsumer.volumes }} {{ toYaml .Values.sentry.metricsConsumer.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.metricsConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.metricsConsumer.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml index f5146cd46..8f415b5c2 100644 --- a/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml +++ b/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml @@ -151,6 +151,9 @@ spec: {{- end }} {{- if .Values.sentry.genericMetricsConsumer.sidecars }} {{ toYaml .Values.sentry.genericMetricsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-generic-metrics-consumer @@ -178,6 +181,9 @@ spec: {{ end }} {{- if .Values.sentry.genericMetricsConsumer.volumes }} {{ toYaml .Values.sentry.genericMetricsConsumer.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.genericMetricsConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.genericMetricsConsumer.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml b/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml index 32f706079..c9a4649de 100644 --- a/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml +++ b/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml @@ -138,6 +138,9 @@ spec: {{- end }} {{- if .Values.sentry.postProcessForwardErrors.sidecars }} {{ toYaml .Values.sentry.postProcessForwardErrors.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-post-process-forwarder-errors @@ -165,6 +168,9 @@ spec: {{ end }} {{- if .Values.sentry.postProcessForwardErrors.volumes }} {{ toYaml .Values.sentry.postProcessForwardErrors.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.postProcessForwardErrors.priorityClassName }} priorityClassName: "{{ .Values.sentry.postProcessForwardErrors.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml b/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml index c9fe752b1..493a330bc 100644 --- a/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml +++ b/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml @@ -130,6 +130,9 @@ spec: {{ end }} {{- if .Values.sentry.postProcessForwardIssuePlatform.volumeMounts }} {{ toYaml .Values.sentry.postProcessForwardIssuePlatform.volumeMounts | indent 8 }} +{{- end }} +{{- if .Values.global.volumeMounts }} +{{ toYaml .Values.global.volumeMounts | indent 8 }} {{- end }} resources: {{ toYaml .Values.sentry.postProcessForwardIssuePlatform.resources | indent 12 }} @@ -139,6 +142,9 @@ spec: {{- end }} {{- if .Values.sentry.postProcessForwardIssuePlatform.sidecars }} {{ toYaml .Values.sentry.postProcessForwardIssuePlatform.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-post-process-forwarder-issue-platform @@ -166,6 +172,9 @@ spec: {{ end }} {{- if .Values.sentry.postProcessForwardIssuePlatform.volumes }} {{ toYaml .Values.sentry.postProcessForwardIssuePlatform.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.postProcessForwardIssuePlatform.priorityClassName }} priorityClassName: "{{ .Values.sentry.postProcessForwardIssuePlatform.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml b/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml index 29093985e..ddbbc4eff 100644 --- a/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml +++ b/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml @@ -146,6 +146,9 @@ spec: {{- end }} {{- if .Values.sentry.postProcessForwardTransactions.sidecars }} {{ toYaml .Values.sentry.postProcessForwardTransactions.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-post-process-forwarder-transactions @@ -173,6 +176,9 @@ spec: {{ end }} {{- if .Values.sentry.postProcessForwardTransactions.volumes }} {{ toYaml .Values.sentry.postProcessForwardTransactions.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.postProcessForwardTransactions.priorityClassName }} priorityClassName: "{{ .Values.sentry.postProcessForwardTransactions.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml b/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml index ce70314e6..7cf37b810 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml @@ -129,6 +129,9 @@ spec: {{- end }} {{- if .Values.sentry.subscriptionConsumerEvents.sidecars }} {{ toYaml .Values.sentry.subscriptionConsumerEvents.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-subscription-consumer-events @@ -156,6 +159,9 @@ spec: {{ end }} {{- if .Values.sentry.subscriptionConsumerEvents.volumes }} {{ toYaml .Values.sentry.subscriptionConsumerEvents.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.subscriptionConsumerEvents.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerEvents.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml b/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml index 3f4b65614..35a7f7b54 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml @@ -147,6 +147,9 @@ spec: {{- end }} {{- if .Values.sentry.subscriptionConsumerGenericMetrics.sidecars }} {{ toYaml .Values.sentry.subscriptionConsumerGenericMetrics.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-subscription-consumer-generic-metrics @@ -174,6 +177,9 @@ spec: {{ end }} {{- if .Values.sentry.subscriptionConsumerGenericMetrics.volumes }} {{ toYaml .Values.sentry.subscriptionConsumerGenericMetrics.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.subscriptionConsumerGenericMetrics.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerGenericMetrics.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml b/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml index 28287cd5a..36604ee96 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml @@ -147,6 +147,9 @@ spec: {{- end }} {{- if .Values.sentry.subscriptionConsumerMetrics.sidecars }} {{ toYaml .Values.sentry.subscriptionConsumerMetrics.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-subscription-consumer-metrics @@ -174,6 +177,9 @@ spec: {{ end }} {{- if .Values.sentry.subscriptionConsumerMetrics.volumes }} {{ toYaml .Values.sentry.subscriptionConsumerMetrics.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.subscriptionConsumerMetrics.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerMetrics.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml b/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml index 551b026e2..91ac80646 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml @@ -129,6 +129,9 @@ spec: {{- end }} {{- if .Values.sentry.subscriptionConsumerTransactions.sidecars }} {{ toYaml .Values.sentry.subscriptionConsumerTransactions.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-subscription-consumer-transactions @@ -156,6 +159,9 @@ spec: {{ end }} {{- if .Values.sentry.subscriptionConsumerTransactions.volumes }} {{ toYaml .Values.sentry.subscriptionConsumerTransactions.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.subscriptionConsumerTransactions.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerTransactions.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/vroom/deployment-vroom.yaml b/charts/sentry/templates/sentry/vroom/deployment-vroom.yaml index 843e5d84e..28cd20f9b 100644 --- a/charts/sentry/templates/sentry/vroom/deployment-vroom.yaml +++ b/charts/sentry/templates/sentry/vroom/deployment-vroom.yaml @@ -119,13 +119,21 @@ spec: {{- end }} {{- if .Values.vroom.sidecars }} {{ toYaml .Values.vroom.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-vroom {{- end }} -{{- if .Values.vroom.volumes }} +{{- if or .Values.vroom.volumes .Values.global.volumes }} volumes: +{{- if .Values.vroom.volumes }} {{ toYaml .Values.vroom.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} {{- if .Values.vroom.priorityClassName }} priorityClassName: "{{ .Values.vroom.priorityClassName }}" diff --git a/charts/sentry/templates/sentry/web/deployment-sentry-web.yaml b/charts/sentry/templates/sentry/web/deployment-sentry-web.yaml index f2f7712d5..32d9d50a0 100644 --- a/charts/sentry/templates/sentry/web/deployment-sentry-web.yaml +++ b/charts/sentry/templates/sentry/web/deployment-sentry-web.yaml @@ -159,6 +159,9 @@ spec: {{- end }} {{- if .Values.sentry.web.sidecars }} {{ toYaml .Values.sentry.web.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-web @@ -200,4 +203,7 @@ spec: {{- if .Values.sentry.web.volumes }} {{ toYaml .Values.sentry.web.volumes | indent 6 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/sentry/worker/deployment-sentry-worker.yaml b/charts/sentry/templates/sentry/worker/deployment-sentry-worker.yaml index 10da36ba7..fda9446e5 100644 --- a/charts/sentry/templates/sentry/worker/deployment-sentry-worker.yaml +++ b/charts/sentry/templates/sentry/worker/deployment-sentry-worker.yaml @@ -150,6 +150,9 @@ spec: {{- end }} {{- if .Values.sentry.worker.sidecars }} {{ toYaml .Values.sentry.worker.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-worker @@ -186,4 +189,7 @@ spec: persistentVolumeClaim: claimName: {{ .Values.geodata.volumeName }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-api.yaml b/charts/sentry/templates/snuba/deployment-snuba-api.yaml index dd78c51d2..d3b8bf5c9 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-api.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-api.yaml @@ -124,6 +124,9 @@ spec: {{- end }} {{- if .Values.snuba.api.sidecars }} {{ toYaml .Values.snuba.api.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -135,4 +138,7 @@ spec: {{- if .Values.snuba.api.volumes }} {{ toYaml .Values.snuba.api.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml index 9d6c43b87..136b9d283 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.consumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.consumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.consumer.sidecars }} +{{ toYaml .Values.snuba.consumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.consumer.volumes }} {{ toYaml .Values.snuba.consumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml index 201cde5f6..d262a2813 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.genericMetricsCountersConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.genericMetricsCountersConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.genericMetricsCountersConsumer.sidecars }} +{{ toYaml .Values.snuba.genericMetricsCountersConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.genericMetricsCountersConsumer.volumes }} {{ toYaml .Values.snuba.genericMetricsCountersConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml index cc1ad72fe..66063a0ce 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.genericMetricsDistributionConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.genericMetricsDistributionConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.genericMetricsDistributionConsumer.sidecars }} +{{ toYaml .Values.snuba.genericMetricsDistributionConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.genericMetricsDistributionConsumer.volumes }} {{ toYaml .Values.snuba.genericMetricsDistributionConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml index cf8ff2440..01848226e 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.genericMetricsSetsConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.genericMetricsSetsConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.genericMetricsSetsConsumer.sidecars }} +{{ toYaml .Values.snuba.genericMetricsSetsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.genericMetricsSetsConsumer.volumes }} {{ toYaml .Values.snuba.genericMetricsSetsConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml index 92622c200..7b68ab7f2 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.groupAttributesConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.groupAttributesConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.groupAttributesConsumer.sidecars }} +{{ toYaml .Values.snuba.groupAttributesConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.groupAttributesConsumer.volumes }} {{ toYaml .Values.snuba.groupAttributesConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml index 64eca82c2..b7d74cb22 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.issueOccurrenceConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.issueOccurrenceConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.issueOccurrenceConsumer.sidecars }} +{{ toYaml .Values.snuba.issueOccurrenceConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.issueOccurrenceConsumer.volumes }} {{ toYaml .Values.snuba.issueOccurrenceConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml index 26c6ee07e..12b16de41 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.metricsConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.metricsConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.metricsConsumer.sidecars }} +{{ toYaml .Values.snuba.metricsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.metricsConsumer.volumes }} {{ toYaml .Values.snuba.metricsConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml index 9e329aebe..b28e133df 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml @@ -160,6 +160,12 @@ spec: {{- if .Values.snuba.outcomesBillingConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.outcomesBillingConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.outcomesBillingConsumer.sidecars }} +{{ toYaml .Values.snuba.outcomesBillingConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -171,4 +177,7 @@ spec: {{- if .Values.snuba.outcomesBillingConsumer.volumes }} {{ toYaml .Values.snuba.outcomesBillingConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml index 9763c6083..2944a5ec2 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml @@ -157,6 +157,12 @@ spec: {{- if .Values.snuba.outcomesConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.outcomesConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.outcomesConsumer.sidecars }} +{{ toYaml .Values.snuba.outcomesConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -168,4 +174,7 @@ spec: {{- if .Values.snuba.outcomesConsumer.volumes }} {{ toYaml .Values.snuba.outcomesConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml index cdb23bd8d..914047539 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.profilingFunctionsConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.profilingFunctionsConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.profilingFunctionsConsumer.sidecars }} +{{ toYaml .Values.profilingFunctionsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.profilingFunctionsConsumer.volumes }} {{ toYaml .Values.snuba.profilingFunctionsConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml index 7305391a4..36e9a60f3 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.profilingProfilesConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.profilingProfilesConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.profilingFunctionsConsumer.sidecars }} +{{ toYaml .Values.profilingFunctionsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.profilingProfilesConsumer.volumes }} {{ toYaml .Values.snuba.profilingProfilesConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml b/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml index 74a5ab8b6..6c75e19d2 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml @@ -128,6 +128,12 @@ spec: {{- if .Values.snuba.replacer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.replacer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.replacer.sidecars }} +{{ toYaml .Values.snuba.replacer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -139,4 +145,7 @@ spec: {{- if .Values.snuba.replacer.volumes }} {{ toYaml .Values.snuba.replacer.volumes | indent 6 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml index a3534da89..7afceeef3 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.replaysConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.replaysConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.replaysConsumer.sidecars }} +{{ toYaml .Values.snuba.replaysConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.replaysConsumer.volumes }} {{ toYaml .Values.snuba.replaysConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml index a45f62c43..ea7769aab 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.spansConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.spansConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.spansConsumer.sidecars }} +{{ toYaml .Values.snuba.spansConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.spansConsumer.volumes }} {{ toYaml .Values.snuba.spansConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-events.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-events.yaml index 876de272c..08b045f86 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-events.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-events.yaml @@ -126,6 +126,12 @@ spec: {{- if .Values.snuba.subscriptionConsumerEvents.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.subscriptionConsumerEvents.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.subscriptionConsumerEvents.sidecars }} +{{ toYaml .Values.snuba.subscriptionConsumerEvents.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -137,4 +143,7 @@ spec: {{- if .Values.snuba.subscriptionConsumerEvents.volumes }} {{ toYaml .Values.snuba.subscriptionConsumerEvents.volumes | indent 6 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-metrics.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-metrics.yaml index 9fcf4aa69..572177c4c 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-metrics.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-metrics.yaml @@ -127,6 +127,12 @@ spec: {{- if .Values.snuba.subscriptionConsumerMetrics.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.subscriptionConsumerMetrics.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.subscriptionConsumerMetrics.sidecars }} +{{ toYaml .Values.snuba.subscriptionConsumerMetrics.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -138,4 +144,7 @@ spec: {{- if .Values.snuba.subscriptionConsumerMetrics.volumes }} {{ toYaml .Values.snuba.subscriptionConsumerMetrics.volumes | indent 6 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-transactions.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-transactions.yaml index a5078e3f6..f174b5d8c 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-transactions.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-transactions.yaml @@ -126,6 +126,12 @@ spec: {{- if .Values.snuba.subscriptionConsumerTransactions.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.subscriptionConsumerTransactions.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.subscriptionConsumerTransactions.sidecars }} +{{ toYaml .Values.snuba.subscriptionConsumerTransactions.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -137,4 +143,7 @@ spec: {{- if .Values.snuba.subscriptionConsumerTransactions.volumes }} {{ toYaml .Values.snuba.subscriptionConsumerTransactions.volumes | indent 6 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml index 046c88888..6dc1889cc 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml @@ -159,6 +159,12 @@ spec: {{- if .Values.snuba.transactionsConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.snuba.transactionsConsumer.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.snuba.transactionsConsumer.sidecars }} +{{ toYaml .Values.snuba.transactionsConsumer.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-snuba @@ -170,4 +176,7 @@ spec: {{- if .Values.snuba.transactionsConsumer.volumes }} {{ toYaml .Values.snuba.transactionsConsumer.volumes | indent 8 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 8 }} +{{- end }} {{- end }} diff --git a/charts/sentry/templates/symbolicator/deployment-symbolicator.yaml b/charts/sentry/templates/symbolicator/deployment-symbolicator.yaml index 128dad20e..e6f8884fe 100644 --- a/charts/sentry/templates/symbolicator/deployment-symbolicator.yaml +++ b/charts/sentry/templates/symbolicator/deployment-symbolicator.yaml @@ -124,6 +124,12 @@ spec: {{- if .Values.symbolicator.api.containerSecurityContext }} securityContext: {{ toYaml .Values.symbolicator.api.containerSecurityContext | indent 12 }} +{{- end }} +{{- if .Values.symbolicator.api.sidecars }} +{{ toYaml .Values.symbolicator.api.sidecars | indent 6 }} +{{- end }} +{{- if .Values.global.sidecars }} +{{ toYaml .Values.global.sidecars | indent 6 }} {{- end }} {{- if .Values.serviceAccount.enabled }} serviceAccountName: {{ .Values.serviceAccount.name }}-symbolicator-api @@ -141,6 +147,9 @@ spec: {{ end }} {{- if .Values.symbolicator.api.volumes }} {{ toYaml .Values.symbolicator.api.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.symbolicator.api.priorityClassName }} priorityClassName: "{{ .Values.symbolicator.api.priorityClassName }}" diff --git a/charts/sentry/values.yaml b/charts/sentry/values.yaml index 9d66a80c7..b726b3fa2 100644 --- a/charts/sentry/values.yaml +++ b/charts/sentry/values.yaml @@ -6,6 +6,8 @@ ipv6: false global: nodeSelector: {} tolerations: [] + sidecars: [] + volumes: [] user: create: true @@ -1732,6 +1734,7 @@ symbolicator: # volumes: [] # volumeMounts: [] + # sidecars: [] # TODO The cleanup cronjob is not yet implemented cleanup: @@ -1739,6 +1742,8 @@ symbolicator: # podLabels: {} # affinity: {} # env: [] + # volumes: [] + # sidecars: [] auth: register: true @@ -2438,6 +2443,10 @@ metrics: affinity: {} securityContext: {} containerSecurityContext: {} + + volumes: [] + sidecars: [] + # schedulerName: # Optional extra labels for pod, i.e. redis-client: "true" # podLabels: {}