From abedfec7bffadc83857f8f30426ea0d8ba6548f3 Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Thu, 23 Nov 2023 12:16:26 +0200
Subject: [PATCH 1/7] Added additionalArgs, livenessProbe & readiness probe in
 every snuba consumer and subscriptions-scheduler-executor

---
 .../templates/deployment-snuba-consumer.yaml  |  11 +
 ...uba-generic-metrics-counters-consumer.yaml |  11 +
 ...eneric-metrics-distributions-consumer.yaml |  11 +
 ...t-snuba-generic-metrics-sets-consumer.yaml |  11 +
 ...yment-snuba-issue-occurrence-consumer.yaml |  11 +
 .../deployment-snuba-metrics-consumer.yaml    |  11 +
 .../deployment-snuba-outcomes-consumer.yaml   |  11 +
 ...nt-snuba-profiling-functions-consumer.yaml |  11 +
 ...ent-snuba-profiling-profiles-consumer.yaml |  11 +
 .../deployment-snuba-replays-consumer.yaml    |  11 +
 ...nt-snuba-subscription-consumer-events.yaml |  11 +
 ...t-snuba-subscription-consumer-metrics.yaml |  11 +
 ...ba-subscription-consumer-transactions.yaml |  11 +
 ...eployment-snuba-transactions-consumer.yaml |  11 +
 sentry/values.yaml                            | 205 +++++++++++++++++-
 15 files changed, 353 insertions(+), 6 deletions(-)

diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml
index 710127158..3a1485adf 100644
--- a/sentry/templates/deployment-snuba-consumer.yaml
+++ b/sentry/templates/deployment-snuba-consumer.yaml
@@ -111,6 +111,17 @@ spec:
           {{- if .Values.snuba.consumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.consumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.consumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.consumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
index bdd420c58..556cdf832 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.genericMetricsCountersConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.genericMetricsCountersConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.genericMetricsCountersConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.genericMetricsCountersConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
index 00d83c6bd..804c7f9bd 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.genericMetricsDistributionConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.genericMetricsDistributionConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.genericMetricsDistributionConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.genericMetricsDistributionConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
index 7a5a2f7b3..c79168863 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.genericMetricsSetsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.genericMetricsSetsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.genericMetricsSetsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.genericMetricsSetsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
index aff5d74db..41e3eded2 100644
--- a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
+++ b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.issueOccurrenceConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.issueOccurrenceConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.issueOccurrenceConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.issueOccurrenceConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-metrics-consumer.yaml b/sentry/templates/deployment-snuba-metrics-consumer.yaml
index 7d5f2fd98..e3a2bf013 100644
--- a/sentry/templates/deployment-snuba-metrics-consumer.yaml
+++ b/sentry/templates/deployment-snuba-metrics-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.metricsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.metricsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.metricsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.metricsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
index e42a9a4b1..ed15a8010 100644
--- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml
+++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
@@ -107,6 +107,17 @@ spec:
           {{- if .Values.snuba.outcomesConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.outcomesConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.outcomesConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.outcomesConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
index 8111428df..979dc53d2 100644
--- a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
@@ -114,6 +114,17 @@ spec:
           {{- if .Values.snuba.profilingFunctionsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.profilingFunctionsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.profilingFunctionsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.profilingFunctionsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
index fb09d4e68..4ec70008f 100644
--- a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
@@ -114,6 +114,17 @@ spec:
           {{- if .Values.snuba.profilingProfilesConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.profilingProfilesConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.profilingProfilesConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.profilingProfilesConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-replays-consumer.yaml b/sentry/templates/deployment-snuba-replays-consumer.yaml
index 3242e211f..f0ab40e11 100644
--- a/sentry/templates/deployment-snuba-replays-consumer.yaml
+++ b/sentry/templates/deployment-snuba-replays-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.replaysConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.replaysConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.replaysConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.replaysConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
index 2ab8dc396..fd1bb01b6 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
@@ -77,6 +77,17 @@ spec:
           - "--followed-consumer-group=snuba-consumers"
           - "--schedule-ttl=60"
           - "--stale-threshold-seconds=900"
+          {{- range .Values.snuba.subscriptionConsumerEvents.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerEvents.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerEvents.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
index a921ccd8f..91979cd3f 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
@@ -78,6 +78,17 @@ spec:
           - "--followed-consumer-group=snuba-metrics-consumers"
           - "--schedule-ttl=60"
           - "--stale-threshold-seconds=900"
+          {{- range .Values.snuba.subscriptionConsumerMetrics.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerMetrics.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerMetrics.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
index dbcc31c8b..b89f1351f 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
@@ -77,6 +77,17 @@ spec:
           - "--followed-consumer-group=transactions_group"
           - "--schedule-ttl=60"
           - "--stale-threshold-seconds=900"
+          {{- range .Values.snuba.subscriptionConsumerTransactions.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerTransactions.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerTransactions.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml
index d87d89bd3..2a901513f 100644
--- a/sentry/templates/deployment-snuba-transactions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.transactionsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.transactionsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.transactionsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.transactionsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/values.yaml b/sentry/values.yaml
index 22560883a..f793fbb7f 100644
--- a/sentry/values.yaml
+++ b/sentry/values.yaml
@@ -482,6 +482,7 @@ sentry:
     containerSecurityContext: {}
     # tolerations: []
     # podLabels: []
+
     sidecars: []
     volumes: []
     # noStrictOffsetReset: false
@@ -655,6 +656,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
     # volumeMounts:
     #   - mountPath: /dev/shm
@@ -683,7 +698,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -722,7 +750,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
   subscriptionConsumerEvents:
     replicas: 1
     env: []
@@ -736,6 +777,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   genericMetricsCountersConsumer:
     replicas: 1
@@ -750,6 +805,21 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
+
 
   genericMetricsDistributionConsumer:
     replicas: 1
@@ -764,6 +834,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   genericMetricsSetsConsumer:
     replicas: 1
@@ -778,6 +862,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   subscriptionConsumerMetrics:
     replicas: 1
@@ -792,6 +890,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   subscriptionConsumerTransactions:
     replicas: 1
@@ -806,6 +918,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   subscriptionConsumerSessions:
     replicas: 1
@@ -843,7 +969,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -900,6 +1039,21 @@ snuba:
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
 
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
+
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -927,7 +1081,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -955,7 +1122,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -982,7 +1162,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm

From 086f1da96924fd651b0f17c26e8593b3bec7f2b3 Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Thu, 23 Nov 2023 12:21:08 +0200
Subject: [PATCH 2/7] Chart version bumped to 20.11.1

---
 sentry/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
index ff330ec8b..42a898036 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: 20.11.0
+version: 20.11.1
 appVersion: 23.11.0
 dependencies:
   - name: memcached

From ac4325c47d3b5b355d7f09f4ab35c50588168d18 Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Sat, 16 Dec 2023 20:44:04 +0200
Subject: [PATCH 3/7] Fixed readinessProbe typo

---
 sentry/templates/deployment-snuba-consumer.yaml               | 4 ++--
 .../deployment-snuba-generic-metrics-counters-consumer.yaml   | 4 ++--
 ...ployment-snuba-generic-metrics-distributions-consumer.yaml | 4 ++--
 .../deployment-snuba-generic-metrics-sets-consumer.yaml       | 4 ++--
 .../templates/deployment-snuba-issue-occurrence-consumer.yaml | 4 ++--
 sentry/templates/deployment-snuba-metrics-consumer.yaml       | 4 ++--
 sentry/templates/deployment-snuba-outcomes-consumer.yaml      | 4 ++--
 .../deployment-snuba-profiling-functions-consumer.yaml        | 4 ++--
 .../deployment-snuba-profiling-profiles-consumer.yaml         | 4 ++--
 sentry/templates/deployment-snuba-replays-consumer.yaml       | 4 ++--
 .../deployment-snuba-subscription-consumer-events.yaml        | 4 ++--
 .../deployment-snuba-subscription-consumer-metrics.yaml       | 4 ++--
 .../deployment-snuba-subscription-consumer-transactions.yaml  | 4 ++--
 sentry/templates/deployment-snuba-transactions-consumer.yaml  | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml
index 3a1485adf..13e0f6adb 100644
--- a/sentry/templates/deployment-snuba-consumer.yaml
+++ b/sentry/templates/deployment-snuba-consumer.yaml
@@ -118,8 +118,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.consumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.consumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
index 556cdf832..f4f12da3c 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.genericMetricsCountersConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.genericMetricsCountersConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
index 804c7f9bd..00f3eecea 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.genericMetricsDistributionConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.genericMetricsDistributionConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
index c79168863..03058e53f 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.genericMetricsSetsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.genericMetricsSetsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
index 41e3eded2..9cf2db72e 100644
--- a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
+++ b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.issueOccurrenceConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.issueOccurrenceConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-metrics-consumer.yaml b/sentry/templates/deployment-snuba-metrics-consumer.yaml
index e3a2bf013..d10831a7e 100644
--- a/sentry/templates/deployment-snuba-metrics-consumer.yaml
+++ b/sentry/templates/deployment-snuba-metrics-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.metricsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.metricsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
index ed15a8010..9e8b632cb 100644
--- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml
+++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
@@ -114,8 +114,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.outcomesConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.outcomesConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
index 979dc53d2..456288746 100644
--- a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
@@ -121,8 +121,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.profilingFunctionsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.profilingFunctionsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
index 4ec70008f..a381f1fc1 100644
--- a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
@@ -121,8 +121,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.profilingProfilesConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.profilingProfilesConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-replays-consumer.yaml b/sentry/templates/deployment-snuba-replays-consumer.yaml
index f0ab40e11..d2cb78a81 100644
--- a/sentry/templates/deployment-snuba-replays-consumer.yaml
+++ b/sentry/templates/deployment-snuba-replays-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.replaysConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.replaysConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
index fd1bb01b6..6e8d23f22 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
@@ -84,8 +84,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.subscriptionConsumerEvents.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.subscriptionConsumerEvents.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
index 91979cd3f..39b0c4ac6 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
@@ -85,8 +85,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.subscriptionConsumerMetrics.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.subscriptionConsumerMetrics.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
index b89f1351f..8714174cb 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
@@ -84,8 +84,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.subscriptionConsumerTransactions.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.subscriptionConsumerTransactions.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml
index 2a901513f..14fce77d8 100644
--- a/sentry/templates/deployment-snuba-transactions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.transactionsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.transactionsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:

From ec989b352f3f4099bf010757cea5a0df2ff1109f Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Mon, 18 Dec 2023 11:52:08 +0200
Subject: [PATCH 4/7] Chart version bumped to 20.12.1

---
 sentry/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
index 42a898036..4248125a2 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: 20.11.1
+version: 20.12.1
 appVersion: 23.11.0
 dependencies:
   - name: memcached

From e82ea909ea8921cfd114064005cbc13a3a5b7bd3 Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Thu, 23 Nov 2023 12:16:26 +0200
Subject: [PATCH 5/7] Added additionalArgs, livenessProbe & readiness probe in
 every snuba consumer and subscriptions-scheduler-executor

---
 .../templates/deployment-snuba-consumer.yaml  |  11 +
 ...uba-generic-metrics-counters-consumer.yaml |  11 +
 ...eneric-metrics-distributions-consumer.yaml |  11 +
 ...t-snuba-generic-metrics-sets-consumer.yaml |  11 +
 ...yment-snuba-issue-occurrence-consumer.yaml |  11 +
 .../deployment-snuba-metrics-consumer.yaml    |  11 +
 .../deployment-snuba-outcomes-consumer.yaml   |  11 +
 ...nt-snuba-profiling-functions-consumer.yaml |  11 +
 ...ent-snuba-profiling-profiles-consumer.yaml |  11 +
 .../deployment-snuba-replays-consumer.yaml    |  11 +
 ...nt-snuba-subscription-consumer-events.yaml |  11 +
 ...t-snuba-subscription-consumer-metrics.yaml |  11 +
 ...ba-subscription-consumer-transactions.yaml |  11 +
 ...eployment-snuba-transactions-consumer.yaml |  11 +
 sentry/values.yaml                            | 205 +++++++++++++++++-
 15 files changed, 353 insertions(+), 6 deletions(-)

diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml
index 710127158..3a1485adf 100644
--- a/sentry/templates/deployment-snuba-consumer.yaml
+++ b/sentry/templates/deployment-snuba-consumer.yaml
@@ -111,6 +111,17 @@ spec:
           {{- if .Values.snuba.consumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.consumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.consumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.consumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
index bdd420c58..556cdf832 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.genericMetricsCountersConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.genericMetricsCountersConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.genericMetricsCountersConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.genericMetricsCountersConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
index 00d83c6bd..804c7f9bd 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.genericMetricsDistributionConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.genericMetricsDistributionConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.genericMetricsDistributionConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.genericMetricsDistributionConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
index 7a5a2f7b3..c79168863 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.genericMetricsSetsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.genericMetricsSetsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.genericMetricsSetsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.genericMetricsSetsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
index aff5d74db..41e3eded2 100644
--- a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
+++ b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.issueOccurrenceConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.issueOccurrenceConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.issueOccurrenceConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.issueOccurrenceConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-metrics-consumer.yaml b/sentry/templates/deployment-snuba-metrics-consumer.yaml
index 7d5f2fd98..e3a2bf013 100644
--- a/sentry/templates/deployment-snuba-metrics-consumer.yaml
+++ b/sentry/templates/deployment-snuba-metrics-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.metricsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.metricsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.metricsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.metricsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
index e42a9a4b1..ed15a8010 100644
--- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml
+++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
@@ -107,6 +107,17 @@ spec:
           {{- if .Values.snuba.outcomesConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.outcomesConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.outcomesConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.outcomesConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
index 8111428df..979dc53d2 100644
--- a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
@@ -114,6 +114,17 @@ spec:
           {{- if .Values.snuba.profilingFunctionsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.profilingFunctionsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.profilingFunctionsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.profilingFunctionsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
index fb09d4e68..4ec70008f 100644
--- a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
@@ -114,6 +114,17 @@ spec:
           {{- if .Values.snuba.profilingProfilesConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.profilingProfilesConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.profilingProfilesConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.profilingProfilesConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-replays-consumer.yaml b/sentry/templates/deployment-snuba-replays-consumer.yaml
index 3242e211f..f0ab40e11 100644
--- a/sentry/templates/deployment-snuba-replays-consumer.yaml
+++ b/sentry/templates/deployment-snuba-replays-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.replaysConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.replaysConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.replaysConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.replaysConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
index 2ab8dc396..fd1bb01b6 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
@@ -77,6 +77,17 @@ spec:
           - "--followed-consumer-group=snuba-consumers"
           - "--schedule-ttl=60"
           - "--stale-threshold-seconds=900"
+          {{- range .Values.snuba.subscriptionConsumerEvents.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerEvents.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerEvents.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
index a921ccd8f..91979cd3f 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
@@ -78,6 +78,17 @@ spec:
           - "--followed-consumer-group=snuba-metrics-consumers"
           - "--schedule-ttl=60"
           - "--stale-threshold-seconds=900"
+          {{- range .Values.snuba.subscriptionConsumerMetrics.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerMetrics.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerMetrics.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
index dbcc31c8b..b89f1351f 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
@@ -77,6 +77,17 @@ spec:
           - "--followed-consumer-group=transactions_group"
           - "--schedule-ttl=60"
           - "--stale-threshold-seconds=900"
+          {{- range .Values.snuba.subscriptionConsumerTransactions.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerTransactions.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.subscriptionConsumerTransactions.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml
index d87d89bd3..2a901513f 100644
--- a/sentry/templates/deployment-snuba-transactions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml
@@ -113,6 +113,17 @@ spec:
           {{- if .Values.snuba.transactionsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
+          {{- range .Values.snuba.transactionsConsumer.additionalArgs}}
+          - "{{ . }}"
+          {{- end}}
+        {{- with .Values.snuba.transactionsConsumer.livenessProbe }}
+        livenessProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
+        {{- with .Values.snuba.transactionsConsumer.readinessProbeProbe }}
+        readinessProbeProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end}}
         ports:
         - containerPort: {{ template "snuba.port" }}
         env:
diff --git a/sentry/values.yaml b/sentry/values.yaml
index 22560883a..f793fbb7f 100644
--- a/sentry/values.yaml
+++ b/sentry/values.yaml
@@ -482,6 +482,7 @@ sentry:
     containerSecurityContext: {}
     # tolerations: []
     # podLabels: []
+
     sidecars: []
     volumes: []
     # noStrictOffsetReset: false
@@ -655,6 +656,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
     # volumeMounts:
     #   - mountPath: /dev/shm
@@ -683,7 +698,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -722,7 +750,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
   subscriptionConsumerEvents:
     replicas: 1
     env: []
@@ -736,6 +777,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   genericMetricsCountersConsumer:
     replicas: 1
@@ -750,6 +805,21 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
+
 
   genericMetricsDistributionConsumer:
     replicas: 1
@@ -764,6 +834,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   genericMetricsSetsConsumer:
     replicas: 1
@@ -778,6 +862,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   subscriptionConsumerMetrics:
     replicas: 1
@@ -792,6 +890,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   subscriptionConsumerTransactions:
     replicas: 1
@@ -806,6 +918,20 @@ snuba:
     autoOffsetReset: "earliest"
     # volumes: []
     # volumeMounts: []
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
 
   subscriptionConsumerSessions:
     replicas: 1
@@ -843,7 +969,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -900,6 +1039,21 @@ snuba:
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
 
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
+
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -927,7 +1081,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -955,7 +1122,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm
@@ -982,7 +1162,20 @@ snuba:
     # maxBatchTimeMs: ""
     # queuedMaxMessagesKbytes: ""
     # queuedMinMessages: ""
-
+    additionalArgs: []
+    # additionalArgs:
+    #  - --health-check-file=/tmp/health.txt
+
+    livenessProbe: {}
+    # livenessProbe:
+    #  exec:
+    #    command:
+    #      - rm
+    #      - /tmp/health.txt
+    #  initialDelaySeconds: 5
+    #  periodSeconds: 320  # should be higher than max.poll.interval.ms (defaults 30000ms)
+
+    readinessProbe: {}
     # volumeMounts:
     #   - mountPath: /dev/shm
     #     name: dshm

From bb66964070b134f4ca62852c1fec62d808d149c2 Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Sat, 16 Dec 2023 20:44:04 +0200
Subject: [PATCH 6/7] Fixed readinessProbe typo

---
 sentry/templates/deployment-snuba-consumer.yaml               | 4 ++--
 .../deployment-snuba-generic-metrics-counters-consumer.yaml   | 4 ++--
 ...ployment-snuba-generic-metrics-distributions-consumer.yaml | 4 ++--
 .../deployment-snuba-generic-metrics-sets-consumer.yaml       | 4 ++--
 .../templates/deployment-snuba-issue-occurrence-consumer.yaml | 4 ++--
 sentry/templates/deployment-snuba-metrics-consumer.yaml       | 4 ++--
 sentry/templates/deployment-snuba-outcomes-consumer.yaml      | 4 ++--
 .../deployment-snuba-profiling-functions-consumer.yaml        | 4 ++--
 .../deployment-snuba-profiling-profiles-consumer.yaml         | 4 ++--
 sentry/templates/deployment-snuba-replays-consumer.yaml       | 4 ++--
 .../deployment-snuba-subscription-consumer-events.yaml        | 4 ++--
 .../deployment-snuba-subscription-consumer-metrics.yaml       | 4 ++--
 .../deployment-snuba-subscription-consumer-transactions.yaml  | 4 ++--
 sentry/templates/deployment-snuba-transactions-consumer.yaml  | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml
index 3a1485adf..13e0f6adb 100644
--- a/sentry/templates/deployment-snuba-consumer.yaml
+++ b/sentry/templates/deployment-snuba-consumer.yaml
@@ -118,8 +118,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.consumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.consumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
index 556cdf832..f4f12da3c 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.genericMetricsCountersConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.genericMetricsCountersConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
index 804c7f9bd..00f3eecea 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.genericMetricsDistributionConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.genericMetricsDistributionConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
index c79168863..03058e53f 100644
--- a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
+++ b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.genericMetricsSetsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.genericMetricsSetsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
index 41e3eded2..9cf2db72e 100644
--- a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
+++ b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.issueOccurrenceConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.issueOccurrenceConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-metrics-consumer.yaml b/sentry/templates/deployment-snuba-metrics-consumer.yaml
index e3a2bf013..d10831a7e 100644
--- a/sentry/templates/deployment-snuba-metrics-consumer.yaml
+++ b/sentry/templates/deployment-snuba-metrics-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.metricsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.metricsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
index ed15a8010..9e8b632cb 100644
--- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml
+++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml
@@ -114,8 +114,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.outcomesConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.outcomesConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
index 979dc53d2..456288746 100644
--- a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml
@@ -121,8 +121,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.profilingFunctionsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.profilingFunctionsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
index 4ec70008f..a381f1fc1 100644
--- a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
+++ b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml
@@ -121,8 +121,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.profilingProfilesConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.profilingProfilesConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-replays-consumer.yaml b/sentry/templates/deployment-snuba-replays-consumer.yaml
index f0ab40e11..d2cb78a81 100644
--- a/sentry/templates/deployment-snuba-replays-consumer.yaml
+++ b/sentry/templates/deployment-snuba-replays-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.replaysConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.replaysConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
index fd1bb01b6..6e8d23f22 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml
@@ -84,8 +84,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.subscriptionConsumerEvents.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.subscriptionConsumerEvents.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
index 91979cd3f..39b0c4ac6 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml
@@ -85,8 +85,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.subscriptionConsumerMetrics.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.subscriptionConsumerMetrics.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
index b89f1351f..8714174cb 100644
--- a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
+++ b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml
@@ -84,8 +84,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.subscriptionConsumerTransactions.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.subscriptionConsumerTransactions.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:
diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml
index 2a901513f..14fce77d8 100644
--- a/sentry/templates/deployment-snuba-transactions-consumer.yaml
+++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml
@@ -120,8 +120,8 @@ spec:
         livenessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
-        {{- with .Values.snuba.transactionsConsumer.readinessProbeProbe }}
-        readinessProbeProbe:
+        {{- with .Values.snuba.transactionsConsumer.readinessProbe }}
+        readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end}}
         ports:

From f46a115833c82d7b55ea6105211eb309bfee2ee1 Mon Sep 17 00:00:00 2001
From: Artemis Tomaras <artemistomaras@gmail.com>
Date: Thu, 18 Jan 2024 14:38:44 +0200
Subject: [PATCH 7/7] Chart version bumped to 21.0.1

---
 sentry/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
index 81f6b7488..0b091f7b7 100644
--- a/sentry/Chart.yaml
+++ b/sentry/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v3
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 21.0.0
+version: 21.0.1
 appVersion: 23.11.2
 dependencies:
   - name: memcached