From f788dee398fa07a3ed8acf187e506d2d5bf7ddbc Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Mon, 11 Aug 2025 20:56:24 +0400 Subject: [PATCH] fix(k8s-operator): duplicate helm labels --- helm-charts/secrets-operator/templates/deployment.yaml | 2 -- helm-charts/secrets-operator/templates/metrics-service.yaml | 1 - k8-operator/config/default/metrics_service.yaml | 1 - k8-operator/config/manager/manager.yaml | 2 -- 4 files changed, 6 deletions(-) diff --git a/helm-charts/secrets-operator/templates/deployment.yaml b/helm-charts/secrets-operator/templates/deployment.yaml index 95cf36801..eda041668 100644 --- a/helm-charts/secrets-operator/templates/deployment.yaml +++ b/helm-charts/secrets-operator/templates/deployment.yaml @@ -9,13 +9,11 @@ spec: replicas: {{ .Values.controllerManager.replicas }} selector: matchLabels: - app.kubernetes.io/name: k8-operator control-plane: controller-manager {{- include "secrets-operator.selectorLabels" . | nindent 6 }} template: metadata: labels: - app.kubernetes.io/name: k8-operator control-plane: controller-manager {{- include "secrets-operator.selectorLabels" . | nindent 8 }} annotations: diff --git a/helm-charts/secrets-operator/templates/metrics-service.yaml b/helm-charts/secrets-operator/templates/metrics-service.yaml index 833117d05..138dd3b3f 100644 --- a/helm-charts/secrets-operator/templates/metrics-service.yaml +++ b/helm-charts/secrets-operator/templates/metrics-service.yaml @@ -8,7 +8,6 @@ metadata: spec: type: {{ .Values.metricsService.type }} selector: - app.kubernetes.io/name: k8-operator control-plane: controller-manager {{- include "secrets-operator.selectorLabels" . | nindent 4 }} ports: diff --git a/k8-operator/config/default/metrics_service.yaml b/k8-operator/config/default/metrics_service.yaml index cf99575a7..6acf3ca49 100644 --- a/k8-operator/config/default/metrics_service.yaml +++ b/k8-operator/config/default/metrics_service.yaml @@ -15,4 +15,3 @@ spec: targetPort: 8443 selector: control-plane: controller-manager - app.kubernetes.io/name: k8-operator diff --git a/k8-operator/config/manager/manager.yaml b/k8-operator/config/manager/manager.yaml index eae496083..fe4601735 100644 --- a/k8-operator/config/manager/manager.yaml +++ b/k8-operator/config/manager/manager.yaml @@ -20,7 +20,6 @@ spec: selector: matchLabels: control-plane: controller-manager - app.kubernetes.io/name: k8-operator replicas: 1 template: metadata: @@ -28,7 +27,6 @@ spec: kubectl.kubernetes.io/default-container: manager labels: control-plane: controller-manager - app.kubernetes.io/name: k8-operator spec: # TODO(user): Uncomment the following code to configure the nodeAffinity expression # according to the platforms which are supported by your solution.