From 0878d0097fd6cae6c5f86ba1d46396240fafc97d Mon Sep 17 00:00:00 2001 From: Benjamin DUPUIS Date: Wed, 3 Sep 2025 10:13:42 +0200 Subject: [PATCH 1/2] fix: #1859 & #1863 Signed-off-by: Benjamin DUPUIS --- .../ingest/transactions/hpa-ingest-consumer-transactions.yaml | 2 +- .../serviceaccount-sentry-ingest-consumer-transactions.yaml | 2 +- ...nt-snuba-subscription-consumer-generic-metrics-counters.yaml | 1 - ...uba-subscription-consumer-generic-metrics-distributions.yaml | 1 - ...ment-snuba-subscription-consumer-generic-metrics-gauges.yaml | 1 - ...oyment-snuba-subscription-consumer-generic-metrics-sets.yaml | 1 - .../templates/uptime-checker/deployment-uptime-checker.yaml | 2 +- 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/charts/sentry/templates/sentry/ingest/transactions/hpa-ingest-consumer-transactions.yaml b/charts/sentry/templates/sentry/ingest/transactions/hpa-ingest-consumer-transactions.yaml index da3f24136..23b4621ef 100644 --- a/charts/sentry/templates/sentry/ingest/transactions/hpa-ingest-consumer-transactions.yaml +++ b/charts/sentry/templates/sentry/ingest/transactions/hpa-ingest-consumer-transactions.yaml @@ -5,7 +5,7 @@ kind: HorizontalPodAutoscaler metadata: name: {{ template "sentry.fullname" . }}-sentry-ingest-consumer-transactions labels: - {{- include "sentry.component.labels" (dict "component" "nginx" "ingest-consumer-transactions" .) | nindent 4 }} + {{- include "sentry.component.labels" (dict "component" "ingest-consumer-transactions" "ctx" .) | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/charts/sentry/templates/sentry/ingest/transactions/serviceaccount-sentry-ingest-consumer-transactions.yaml b/charts/sentry/templates/sentry/ingest/transactions/serviceaccount-sentry-ingest-consumer-transactions.yaml index 91f190fe4..e8329b5b3 100644 --- a/charts/sentry/templates/sentry/ingest/transactions/serviceaccount-sentry-ingest-consumer-transactions.yaml +++ b/charts/sentry/templates/sentry/ingest/transactions/serviceaccount-sentry-ingest-consumer-transactions.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: {{ .Values.serviceAccount.name }}-ingest-consumer-transactions labels: - {{- include "sentry.component.labels" (dict "component" "nginx" "ingest-consumer-transactions" .) | nindent 4 }} + {{- include "sentry.component.labels" (dict "component" "ingest-consumer-transactions" "ctx" .) | nindent 4 }} {{- if .Values.serviceAccount.annotations }} annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }} {{- end }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-counters.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-counters.yaml index de78d68f1..fcdde5c5f 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-counters.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-counters.yaml @@ -9,7 +9,6 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" {{- include "sentry.component.labels" (dict "component" "snuba-subscription-consumer-generic-metrics-counters" "ctx" .) | nindent 4 }} {{- if .Values.asHook }} {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-distributions.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-distributions.yaml index 3133f6a7c..60d38b414 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-distributions.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-distributions.yaml @@ -9,7 +9,6 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" {{- include "sentry.component.labels" (dict "component" "snuba-subscription-consumer-generic-metrics-distributions" "ctx" .) | nindent 4 }} {{- if .Values.asHook }} {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-gauges.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-gauges.yaml index 53269c92b..b28011ee4 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-gauges.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-gauges.yaml @@ -9,7 +9,6 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" {{- include "sentry.component.labels" (dict "component" "snuba-subscription-consumer-generic-metrics-gauges" "ctx" .) | nindent 4 }} {{- if .Values.asHook }} {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} diff --git a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-sets.yaml b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-sets.yaml index 61a5b8224..6464dd87c 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-sets.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-subscription-consumer-generic-metrics-sets.yaml @@ -9,7 +9,6 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" {{- include "sentry.component.labels" (dict "component" "snuba-subscription-consumer-generic-metrics-sets" "ctx" .) | nindent 4 }} {{- if .Values.asHook }} {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} diff --git a/charts/sentry/templates/uptime-checker/deployment-uptime-checker.yaml b/charts/sentry/templates/uptime-checker/deployment-uptime-checker.yaml index 1ce86bf55..21662d616 100644 --- a/charts/sentry/templates/uptime-checker/deployment-uptime-checker.yaml +++ b/charts/sentry/templates/uptime-checker/deployment-uptime-checker.yaml @@ -9,7 +9,7 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" + {{- include "sentry.component.labels" (dict "component" "uptime-checker" "ctx" .) | nindent 4 }} {{- if .Values.asHook }} {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} annotations: From 22a9f3dc022efa2e17b7fdf4d15ded4548b7d64a Mon Sep 17 00:00:00 2001 From: Benjamin DUPUIS Date: Thu, 4 Sep 2025 10:46:02 +0200 Subject: [PATCH 2/2] chore: update binami charts --- charts/sentry/Chart.lock | 14 +++++++------- charts/sentry/Chart.yaml | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/sentry/Chart.lock b/charts/sentry/Chart.lock index e062ea7f6..b3ac41169 100644 --- a/charts/sentry/Chart.lock +++ b/charts/sentry/Chart.lock @@ -1,10 +1,10 @@ dependencies: - name: memcached repository: oci://registry-1.docker.io/bitnamicharts - version: 7.5.2 + version: 7.9.7 - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 17.11.3 + version: 22.0.7 - name: kafka repository: oci://registry-1.docker.io/bitnamicharts version: 29.3.14 @@ -13,15 +13,15 @@ dependencies: version: 4.0.1 - name: zookeeper repository: oci://registry-1.docker.io/bitnamicharts - version: 11.4.11 + version: 13.8.7 - name: rabbitmq repository: oci://registry-1.docker.io/bitnamicharts - version: 11.16.2 + version: 16.0.14 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts version: 12.5.1 - name: nginx repository: oci://registry-1.docker.io/bitnamicharts - version: 18.2.5 -digest: sha256:f57f1f1f8d455729a7e04eb41c658530d710c9febe34844e062f084c17c1a382 -generated: "2025-07-21T06:40:24.054695705Z" + version: 21.1.23 +digest: sha256:ea07580e6ce570272b3d9dfefaa3c5d65c970a9c4006aace980776a7793c0e29 +generated: "2025-09-04T10:45:27.626050433+02:00" diff --git a/charts/sentry/Chart.yaml b/charts/sentry/Chart.yaml index cb9f10381..d8c2ae359 100644 --- a/charts/sentry/Chart.yaml +++ b/charts/sentry/Chart.yaml @@ -8,11 +8,11 @@ appVersion: 25.8.0 dependencies: - name: memcached repository: oci://registry-1.docker.io/bitnamicharts - version: 7.5.2 + version: 7.9.7 condition: sourcemaps.enabled - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 17.11.3 + version: 22.0.7 condition: redis.enabled - name: kafka repository: oci://registry-1.docker.io/bitnamicharts @@ -24,11 +24,11 @@ dependencies: condition: clickhouse.enabled - name: zookeeper repository: oci://registry-1.docker.io/bitnamicharts - version: 11.4.11 + version: 13.8.7 condition: zookeeper.enabled - name: rabbitmq repository: oci://registry-1.docker.io/bitnamicharts - version: 11.16.2 + version: 16.0.14 alias: rabbitmq condition: rabbitmq.enabled - name: postgresql @@ -37,7 +37,7 @@ dependencies: condition: postgresql.enabled - name: nginx repository: oci://registry-1.docker.io/bitnamicharts - version: 18.2.5 + version: 21.1.23 condition: nginx.enabled maintainers: - name: sentry-kubernetes