diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml index eb6be0d5..229b78ce 100644 --- a/sentry/Chart.yaml +++ b/sentry/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sentry description: A Helm chart for Kubernetes type: application -version: 22.2.0 +version: 22.2.1 appVersion: 24.2.0 dependencies: - name: memcached diff --git a/sentry/templates/cronjob-sentry-cleanup.yaml b/sentry/templates/cronjob-sentry-cleanup.yaml index 3c26abae..807c4af7 100644 --- a/sentry/templates/cronjob-sentry-cleanup.yaml +++ b/sentry/templates/cronjob-sentry-cleanup.yaml @@ -101,6 +101,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: @@ -126,6 +129,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/sentry/templates/deployment-metrics.yaml b/sentry/templates/deployment-metrics.yaml index 1f66ea4e..f3173eba 100644 --- a/sentry/templates/deployment-metrics.yaml +++ b/sentry/templates/deployment-metrics.yaml @@ -105,9 +105,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/sentry/templates/deployment-relay.yaml b/sentry/templates/deployment-relay.yaml index 55df49e4..3756e459 100644 --- a/sentry/templates/deployment-relay.yaml +++ b/sentry/templates/deployment-relay.yaml @@ -160,6 +160,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 @@ -173,6 +176,9 @@ spec: emptyDir: {} {{- 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/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml b/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml index 14830698..0ed2490a 100644 --- a/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml +++ b/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml @@ -118,6 +118,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 @@ -145,6 +148,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/sentry/templates/deployment-sentry-cron.yaml b/sentry/templates/deployment-sentry-cron.yaml index 62d66e52..8c45b4a7 100644 --- a/sentry/templates/deployment-sentry-cron.yaml +++ b/sentry/templates/deployment-sentry-cron.yaml @@ -99,6 +99,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 @@ -126,6 +129,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/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml b/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml index 163e02f0..80b85035 100644 --- a/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml +++ b/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml @@ -116,6 +116,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 @@ -143,6 +146,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/templates/deployment-sentry-ingest-consumer-attachments.yaml b/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml index 96712207..9dc78b83 100644 --- a/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml +++ b/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml @@ -118,6 +118,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestConsumer.sidecars }} {{ toYaml .Values.sentry.ingestConsumer.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 @@ -145,6 +148,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestConsumer.volumes }} {{ toYaml .Values.sentry.ingestConsumer.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumer.priorityClassName }}" diff --git a/sentry/templates/deployment-sentry-ingest-consumer-events.yaml b/sentry/templates/deployment-sentry-ingest-consumer-events.yaml index 1843f6ac..258584c0 100644 --- a/sentry/templates/deployment-sentry-ingest-consumer-events.yaml +++ b/sentry/templates/deployment-sentry-ingest-consumer-events.yaml @@ -121,6 +121,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestConsumer.sidecars }} {{ toYaml .Values.sentry.ingestConsumer.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 @@ -148,6 +151,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestConsumer.volumes }} {{ toYaml .Values.sentry.ingestConsumer.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumer.priorityClassName }}" diff --git a/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml b/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml index 86d667fa..486a86b0 100644 --- a/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml +++ b/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml @@ -121,6 +121,9 @@ spec: {{- end }} {{- if .Values.sentry.ingestConsumer.sidecars }} {{ toYaml .Values.sentry.ingestConsumer.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-transactions @@ -148,6 +151,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestConsumer.volumes }} {{ toYaml .Values.sentry.ingestConsumer.volumes | indent 6 }} +{{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} {{- if .Values.sentry.ingestConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumer.priorityClassName }}" diff --git a/sentry/templates/deployment-sentry-ingest-monitors.yaml b/sentry/templates/deployment-sentry-ingest-monitors.yaml index 16a28e88..916814a7 100644 --- a/sentry/templates/deployment-sentry-ingest-monitors.yaml +++ b/sentry/templates/deployment-sentry-ingest-monitors.yaml @@ -110,6 +110,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 @@ -137,6 +140,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/sentry/templates/deployment-sentry-ingest-occurrences.yaml b/sentry/templates/deployment-sentry-ingest-occurrences.yaml index 97941ed5..9edcf92a 100644 --- a/sentry/templates/deployment-sentry-ingest-occurrences.yaml +++ b/sentry/templates/deployment-sentry-ingest-occurrences.yaml @@ -110,6 +110,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 @@ -137,6 +140,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/sentry/templates/deployment-sentry-ingest-profiles.yaml b/sentry/templates/deployment-sentry-ingest-profiles.yaml index 7a2af546..44929c12 100644 --- a/sentry/templates/deployment-sentry-ingest-profiles.yaml +++ b/sentry/templates/deployment-sentry-ingest-profiles.yaml @@ -110,6 +110,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 @@ -137,6 +140,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/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml b/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml index 894111c3..dfe5a15e 100644 --- a/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml +++ b/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml @@ -110,6 +110,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 @@ -137,6 +140,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/sentry/templates/deployment-sentry-metrics-consumer.yaml b/sentry/templates/deployment-sentry-metrics-consumer.yaml index ba64518b..e388afde 100644 --- a/sentry/templates/deployment-sentry-metrics-consumer.yaml +++ b/sentry/templates/deployment-sentry-metrics-consumer.yaml @@ -116,6 +116,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 @@ -143,6 +146,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/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml b/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml index 304f4775..077ca2a4 100644 --- a/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml +++ b/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml @@ -108,6 +108,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 @@ -135,6 +138,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/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml b/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml index 57c3cd1c..f8e33bc5 100644 --- a/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml +++ b/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml @@ -100,6 +100,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 }} @@ -109,6 +112,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 @@ -136,6 +142,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/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml b/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml index 252cabbe..fce427eb 100644 --- a/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml +++ b/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml @@ -112,6 +112,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 @@ -139,6 +142,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/sentry/templates/deployment-sentry-subscription-consumer-events.yaml b/sentry/templates/deployment-sentry-subscription-consumer-events.yaml index 26c21abf..347034e6 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-events.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-events.yaml @@ -99,6 +99,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 @@ -126,6 +129,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/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml b/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml index e368d345..1dcd308d 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml @@ -116,6 +116,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 @@ -143,6 +146,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/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml b/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml index e7444209..8dc9943e 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml @@ -116,6 +116,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 @@ -143,6 +146,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/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml b/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml index 6a366b87..f1cc312c 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml @@ -99,6 +99,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 @@ -126,6 +129,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/sentry/templates/deployment-sentry-web.yaml b/sentry/templates/deployment-sentry-web.yaml index 0e844991..a0321dc8 100644 --- a/sentry/templates/deployment-sentry-web.yaml +++ b/sentry/templates/deployment-sentry-web.yaml @@ -129,6 +129,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 @@ -165,4 +168,6 @@ 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 }} diff --git a/sentry/templates/deployment-sentry-worker.yaml b/sentry/templates/deployment-sentry-worker.yaml index 7827af62..ea25bde1 100644 --- a/sentry/templates/deployment-sentry-worker.yaml +++ b/sentry/templates/deployment-sentry-worker.yaml @@ -119,6 +119,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 @@ -150,4 +153,6 @@ spec: {{- if .Values.sentry.worker.volumes }} {{ toYaml .Values.sentry.worker.volumes | indent 6 }} {{- end }} +{{- if .Values.global.volumes }} +{{ toYaml .Values.global.volumes | indent 6 }} {{- end }} diff --git a/sentry/templates/deployment-snuba-api.yaml b/sentry/templates/deployment-snuba-api.yaml index 7c239cd6..841e671f 100644 --- a/sentry/templates/deployment-snuba-api.yaml +++ b/sentry/templates/deployment-snuba-api.yaml @@ -114,6 +114,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 @@ -125,4 +128,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml index 92b8f8a3..2f54ccf4 100644 --- a/sentry/templates/deployment-snuba-consumer.yaml +++ b/sentry/templates/deployment-snuba-consumer.yaml @@ -134,6 +134,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 @@ -145,4 +151,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml index 6f85cdb1..3d9319bc 100644 --- a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml +++ b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml index 0d1653da..d093af37 100644 --- a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml +++ b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml index ea12e9ef..7a8b023d 100644 --- a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml +++ b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml index f8fd23cc..5dd5ed68 100644 --- a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml +++ b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-metrics-consumer.yaml b/sentry/templates/deployment-snuba-metrics-consumer.yaml index 50da46bf..7f2a5a86 100644 --- a/sentry/templates/deployment-snuba-metrics-consumer.yaml +++ b/sentry/templates/deployment-snuba-metrics-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml index 17d8c213..c3e2dcaa 100644 --- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml +++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml @@ -130,6 +130,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 @@ -141,4 +147,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml index 8111428d..8ede57e6 100644 --- a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml +++ b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,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/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml index fb09d4e6..3502c17e 100644 --- a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml +++ b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,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/sentry/templates/deployment-snuba-replacer.yaml b/sentry/templates/deployment-snuba-replacer.yaml index 56ae4017..4456cf48 100644 --- a/sentry/templates/deployment-snuba-replacer.yaml +++ b/sentry/templates/deployment-snuba-replacer.yaml @@ -113,6 +113,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 @@ -124,4 +130,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-replays-consumer.yaml b/sentry/templates/deployment-snuba-replays-consumer.yaml index 9fb1c7b6..c96b89ce 100644 --- a/sentry/templates/deployment-snuba-replays-consumer.yaml +++ b/sentry/templates/deployment-snuba-replays-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml index 7e87be30..3c2fde99 100644 --- a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml +++ b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml @@ -100,6 +100,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 @@ -111,4 +117,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml index e590ca83..89461cf1 100644 --- a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml +++ b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml @@ -101,6 +101,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 @@ -112,4 +118,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml index e161e2ad..b120767e 100644 --- a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml +++ b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml @@ -100,6 +100,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 @@ -111,4 +117,6 @@ 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 }} diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml index 79f0a66c..3a1daae1 100644 --- a/sentry/templates/deployment-snuba-transactions-consumer.yaml +++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml @@ -136,6 +136,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 @@ -147,4 +153,6 @@ 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 }} diff --git a/sentry/templates/deployment-symbolicator.yaml b/sentry/templates/deployment-symbolicator.yaml index a0ccacb3..feae4e5c 100644 --- a/sentry/templates/deployment-symbolicator.yaml +++ b/sentry/templates/deployment-symbolicator.yaml @@ -113,6 +113,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 @@ -130,6 +136,9 @@ spec: {{ end }} {{- if .Values.sentry.ingestConsumer.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/sentry/templates/deployment-vroom.yaml b/sentry/templates/deployment-vroom.yaml index c13a31ae..8fc0fa8f 100644 --- a/sentry/templates/deployment-vroom.yaml +++ b/sentry/templates/deployment-vroom.yaml @@ -109,13 +109,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/sentry/templates/hooks/sentry-db-check.job.yaml b/sentry/templates/hooks/sentry-db-check.job.yaml index 66b494d2..3fcff3fd 100644 --- a/sentry/templates/hooks/sentry-db-check.job.yaml +++ b/sentry/templates/hooks/sentry-db-check.job.yaml @@ -189,9 +189,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/sentry/templates/hooks/sentry-db-init.job.yaml b/sentry/templates/hooks/sentry-db-init.job.yaml index 1f201bae..6747ca6d 100644 --- a/sentry/templates/hooks/sentry-db-init.job.yaml +++ b/sentry/templates/hooks/sentry-db-init.job.yaml @@ -97,6 +97,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 @@ -104,6 +107,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/sentry/templates/hooks/snuba-db-init.job.yaml b/sentry/templates/hooks/snuba-db-init.job.yaml index 05a7d3fe..01704115 100644 --- a/sentry/templates/hooks/snuba-db-init.job.yaml +++ b/sentry/templates/hooks/snuba-db-init.job.yaml @@ -109,6 +109,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 @@ -116,6 +122,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/sentry/templates/hooks/snuba-migrate.job.yaml b/sentry/templates/hooks/snuba-migrate.job.yaml index 3754804d..8033fdf6 100644 --- a/sentry/templates/hooks/snuba-migrate.job.yaml +++ b/sentry/templates/hooks/snuba-migrate.job.yaml @@ -100,6 +100,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 @@ -107,6 +113,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/sentry/templates/hooks/user-create.yaml b/sentry/templates/hooks/user-create.yaml index fda1247f..e92a46fd 100644 --- a/sentry/templates/hooks/user-create.yaml +++ b/sentry/templates/hooks/user-create.yaml @@ -113,6 +113,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 @@ -120,6 +126,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/sentry/values.yaml b/sentry/values.yaml index 1db78944..34a0bd2c 100644 --- a/sentry/values.yaml +++ b/sentry/values.yaml @@ -17,6 +17,11 @@ user: # deploys relay & snuba consumers as post hooks asHook: true +# Global parameter for all deployments +global: + sidecars: [] + volumes: [] + images: sentry: # repository: getsentry/sentry @@ -1131,6 +1136,7 @@ symbolicator: # volumes: [] # volumeMounts: [] + # sidecars: [] # TODO The cleanup cronjob is not yet implemented cleanup: @@ -1138,6 +1144,8 @@ symbolicator: # podLabels: [] # affinity: {} # env: [] + # volumes: [] + # sidecars: [] auth: register: true @@ -1700,6 +1708,10 @@ metrics: affinity: {} securityContext: {} containerSecurityContext: {} + + volumes: [] + sidecars: [] + # schedulerName: # Optional extra labels for pod, i.e. redis-client: "true" # podLabels: []