Feat: Add missing sidecar and global parameter for deployments & hooks

sentry-kubernetes · Apr 19, 2024 · 0696ed6 · 0696ed6
1 parent 810abed
commit 0696ed6
Show file tree

Hide file tree

Showing 48 changed files with 349 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}"