feat(sentry): Add missing --no-strict-offset-reset and --auto-offset-…

…reset for consumers (#1535)
sentry-kubernetes · Oct 13, 2024 · 8e0eea0 · 8e0eea0
1 parent 33d9945
commit 8e0eea0
Show file tree

Hide file tree

Showing 33 changed files with 180 additions and 21 deletions.
diff --git a/...ry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml b/...ry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml
@@ -86,6 +86,10 @@ spec:
           - "ingest-attachments"
           - "--consumer-group"
           - "ingest-consumer"
+          {{- if .Values.sentry.ingestConsumerAttachments.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestConsumerAttachments.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.sentry.ingestConsumerAttachments.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}

diff --git a/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml b/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml
@@ -86,6 +86,10 @@ spec:
           - "ingest-events"
           - "--consumer-group"
           - "ingest-consumer"
+          {{- if .Values.sentry.ingestConsumerEvents.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestConsumerEvents.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.sentry.ingestConsumerEvents.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}

diff --git a/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml b/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml
@@ -86,6 +86,13 @@ spec:
           - "ingest-monitors"
           - "--consumer-group"
           - "ingest-monitors"
+          {{- if .Values.sentry.ingestMonitors.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestMonitors.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestMonitors.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.ingestMonitors.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml b/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml
@@ -86,6 +86,13 @@ spec:
           - "ingest-occurrences"
           - "--consumer-group"
           - "ingest-occurrences"
+          {{- if .Values.sentry.ingestOccurrences.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestOccurrences.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestOccurrences.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.ingestOccurrences.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml b/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml
@@ -86,6 +86,13 @@ spec:
           - "ingest-profiles"
           - "--consumer-group"
           - "ingest-profiles"
+          {{- if .Values.sentry.ingestProfiles.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestProfiles.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestProfiles.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.ingestProfiles.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/...templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml b/...templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml
@@ -86,6 +86,13 @@ spec:
           - "ingest-replay-recordings"
           - "--consumer-group"
           - "ingest-replay-recordings"
+          {{- if .Values.sentry.ingestReplayRecordings.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestReplayRecordings.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestReplayRecordings.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.ingestReplayRecordings.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/.../templates/sentry/ingest/transactions/deployment-sentry-ingest-consumer-transactions.yaml b/.../templates/sentry/ingest/transactions/deployment-sentry-ingest-consumer-transactions.yaml
@@ -86,6 +86,10 @@ spec:
           - "ingest-transactions"
           - "--consumer-group"
           - "ingest-consumer"
+          {{- if .Values.sentry.ingestConsumerTransactions.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.ingestConsumerTransactions.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.sentry.ingestConsumerTransactions.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}

diff --git a/...s/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml b/...s/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml
@@ -86,6 +86,13 @@ spec:
           - "billing-metrics-consumer"
           - "--consumer-group"
           - "billing-metrics-consumer"
+          {{- if .Values.sentry.billingMetricsConsumer.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.billingMetricsConsumer.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.billingMetricsConsumer.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.billingMetricsConsumer.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml
@@ -84,6 +84,13 @@ spec:
           - "ingest-metrics"
           - "--consumer-group"
           - "metrics-consumer"
+          {{- if .Values.sentry.metricsConsumer.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.metricsConsumer.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.metricsConsumer.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.metricsConsumer.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/...s/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml b/...s/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml
@@ -82,6 +82,10 @@ spec:
           - "run"
           - "consumer"
           - "ingest-generic-metrics"
+          {{- if .Values.sentry.genericMetricsConsumer.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.genericMetricsConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.sentry.genericMetricsConsumer.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}

diff --git a/...sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml b/...sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml
@@ -86,7 +86,11 @@ spec:
           - "post-process-forwarder"
           - "--synchronize-commit-log-topic=snuba-commit-log"
           - "--synchronize-commit-group=snuba-consumers"
-          {{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }}
+          {{- if .Values.sentry.postProcessForwardErrors.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.postProcessForwardErrors.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.postProcessForwardErrors.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}
           {{- if .Values.sentry.postProcessForwardErrors.livenessProbe.enabled }}

diff --git a/...ess-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml b/...ess-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml
@@ -87,6 +87,10 @@ spec:
           - "--synchronize-commit-log-topic=snuba-generic-events-commit-log"
           - "--synchronize-commit-group"
           - "generic_events_group"
+          {{- if .Values.sentry.postProcessForwardIssuePlatform.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.postProcessForwardIssuePlatform.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.sentry.postProcessForwardIssuePlatform.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}

diff --git a/...process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml b/...process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml
@@ -87,6 +87,10 @@ spec:
           - "--synchronize-commit-log-topic=snuba-transactions-commit-log"
           - "--synchronize-commit-group"
           - "transactions_group"
+          {{- if .Values.sentry.postProcessForwardTransactions.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.postProcessForwardTransactions.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }}
           - "--no-strict-offset-reset"
           {{- end }}

diff --git a/...s/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml b/...s/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml
@@ -75,6 +75,13 @@ spec:
           - "run"
           - "consumer"
           - "events-subscription-results"
+          {{- if .Values.sentry.subscriptionConsumerEvents.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.subscriptionConsumerEvents.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.subscriptionConsumerEvents.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           - "--consumer-group"
           - "query-subscription-consumer"
           {{- if .Values.sentry.subscriptionConsumerEvents.livenessProbe.enabled }}

diff --git a/...ion-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml b/...ion-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml
@@ -84,6 +84,13 @@ spec:
           - "generic-metrics-subscription-results"
           - "--consumer-group"
           - "query-subscription-consumer"
+          {{- if .Values.sentry.subscriptionConsumerGenericMetrics.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.subscriptionConsumerGenericMetrics.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.subscriptionConsumerGenericMetrics.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.subscriptionConsumerGenericMetrics.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/...sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml b/...sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml
@@ -84,6 +84,13 @@ spec:
           - "metrics-subscription-results"
           - "--consumer-group"
           - "query-subscription-consumer"
+          {{- if .Values.sentry.subscriptionConsumerMetrics.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.subscriptionConsumerMetrics.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.subscriptionConsumerMetrics.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.subscriptionConsumerMetrics.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/...scription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml b/...scription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml
@@ -77,6 +77,13 @@ spec:
           - "transactions-subscription-results"
           - "--consumer-group"
           - "query-subscription-consumer"
+          {{- if .Values.sentry.subscriptionConsumerTransactions.autoOffsetReset }}
+          - "--auto-offset-reset"
+          - "{{ .Values.sentry.subscriptionConsumerTransactions.autoOffsetReset }}"
+          {{- end }}
+          {{- if .Values.sentry.subscriptionConsumerTransactions.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
           {{- if .Values.sentry.subscriptionConsumerTransactions.livenessProbe.enabled }}
           - "--healthcheck-file-path"
           - "/tmp/health.txt"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "errors"
           - "--consumer-group"
           - "snuba-consumers"
+          {{- if .Values.snuba.consumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.consumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.consumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.consumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "generic_metrics_counters_raw"
           - "--consumer-group"
           - "snuba-gen-metrics-counters-consumers"
+          {{- if .Values.snuba.genericMetricsCountersConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.genericMetricsCountersConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.genericMetricsCountersConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.genericMetricsCountersConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "generic_metrics_distributions_raw"
           - "--consumer-group"
           - "snuba-gen-metrics-distributions-consumers"
+          {{- if .Values.snuba.genericMetricsDistributionConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.genericMetricsDistributionConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.genericMetricsDistributionConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.genericMetricsDistributionConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "generic_metrics_sets_raw"
           - "--consumer-group"
           - "snuba-gen-metrics-sets-consumers"
+          {{- if .Values.snuba.genericMetricsSetsConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.genericMetricsSetsConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.genericMetricsSetsConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.genericMetricsSetsConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "group_attributes"
           - "--consumer-group"
           - "snuba-group-attributes-group"
+          {{- if .Values.snuba.groupAttributesConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.groupAttributesConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.groupAttributesConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.groupAttributesConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "search_issues"
           - "--consumer-group"
           - "generic_events_group"
+          {{- if .Values.snuba.issueOccurrenceConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.issueOccurrenceConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.issueOccurrenceConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.issueOccurrenceConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "metrics_raw"
           - "--consumer-group"
           - "snuba-metrics-consumers"
+          {{- if .Values.snuba.metricsConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.metricsConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.metricsConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.metricsConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "outcomes_raw"
           - "--consumer-group"
           - "snuba-consumers"
+          {{- if .Values.snuba.outcomesBillingConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.outcomesBillingConsumer.autoOffsetReset }}"
+          {{- end }}
           - "--raw-events-topic"
           - "outcomes-billing"
           {{- if .Values.snuba.outcomesBillingConsumer.maxBatchSize }}

diff --git a/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "outcomes_raw"
           - "--consumer-group"
           - "snuba-consumers"
+          {{- if .Values.snuba.outcomesConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.outcomesConsumer.autoOffsetReset }}"
+          {{- end }}
           - "--max-batch-size"
           - "{{ default "3" .Values.snuba.outcomesConsumer.maxBatchSize }}"
           {{- if .Values.snuba.outcomesConsumer.processes }}

diff --git a/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "functions_raw"
           - "--consumer-group"
           - "functions_raw_group"
+          {{- if .Values.snuba.profilingFunctionsConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.profilingFunctionsConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.profilingFunctionsConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.profilingFunctionsConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "profiles"
           - "--consumer-group"
           - "profiles_group"
+          {{- if .Values.snuba.profilingProfilesConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.profilingProfilesConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.profilingProfilesConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.profilingProfilesConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml b/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml
@@ -81,8 +81,10 @@ spec:
           - "replacer"
           - "--storage"
           - "errors"
+          {{- if .Values.snuba.replacer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.replacer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.replacer.maxBatchTimeMs }}
           - "--max-batch-time-ms"
           - "{{ .Values.snuba.replacer.maxBatchTimeMs }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "replays"
           - "--consumer-group"
           - "replays_group"
+          {{- if .Values.snuba.replaysConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.replaysConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.replaysConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.replaysConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "spans"
           - "--consumer-group"
           - "snuba-spans-group"
+          {{- if .Values.snuba.spansConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.spansConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.spansConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.spansConsumer.maxBatchSize }}"

diff --git a/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml
@@ -83,8 +83,10 @@ spec:
           - "transactions"
           - "--consumer-group"
           - "transactions_group"
+          {{- if .Values.snuba.transactionsConsumer.autoOffsetReset }}
           - "--auto-offset-reset"
           - "{{ .Values.snuba.transactionsConsumer.autoOffsetReset }}"
+          {{- end }}
           {{- if .Values.snuba.transactionsConsumer.maxBatchSize }}
           - "--max-batch-size"
           - "{{ .Values.snuba.transactionsConsumer.maxBatchSize }}"