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 diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml index 710127158..13e0f6adb 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.readinessProbe }} + readinessProbe: + {{- 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..f4f12da3c 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.readinessProbe }} + readinessProbe: + {{- 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..00f3eecea 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.readinessProbe }} + readinessProbe: + {{- 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..03058e53f 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.readinessProbe }} + readinessProbe: + {{- 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..9cf2db72e 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.readinessProbe }} + readinessProbe: + {{- 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..d10831a7e 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.readinessProbe }} + readinessProbe: + {{- 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..9e8b632cb 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.readinessProbe }} + readinessProbe: + {{- 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..456288746 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.readinessProbe }} + readinessProbe: + {{- 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..a381f1fc1 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.readinessProbe }} + readinessProbe: + {{- 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..d2cb78a81 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.readinessProbe }} + readinessProbe: + {{- 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..6e8d23f22 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.readinessProbe }} + readinessProbe: + {{- 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..39b0c4ac6 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.readinessProbe }} + readinessProbe: + {{- 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..8714174cb 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.readinessProbe }} + readinessProbe: + {{- 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..14fce77d8 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.readinessProbe }} + readinessProbe: + {{- 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