feat: Add missing sidecar and global parameter for deployments & hooks (

#1230)
sentry-kubernetes · Dec 4, 2024 · ac8143f · ac8143f
1 parent def119d
commit ac8143f
Show file tree

Hide file tree

Showing 49 changed files with 383 additions and 5 deletions.
diff --git 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
@@ -103,13 +103,19 @@ 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
         configMap:
           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
@@ -115,13 +115,22 @@ 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
         configMap:
           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
@@ -106,13 +106,22 @@ 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
         configMap:
           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
@@ -120,13 +120,22 @@ 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
         configMap:
           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
@@ -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
@@ -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
@@ -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/...ry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml b/...ry/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
@@ -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
@@ -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
@@ -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
@@ -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/...templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml b/...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/...s/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml b/...s/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
@@ -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
@@ -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/...s/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml b/...s/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/...sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml b/...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 }}"