fix: #1859 & #1863 (#1861)

Signed-off-by: Benjamin DUPUIS <[email protected]>
Co-authored-by: Benjamin DUPUIS <[email protected]>

Author: Poil

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

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 }}

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 */}}

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 */}}

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 */}}

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 */}}

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: