Revert customlabels variable

redpanda-data · Oct 18, 2022 · 9918d41 · 9918d41
1 parent 37424c1
commit 9918d41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/charts/kminion/templates/deployment.yaml b/charts/kminion/templates/deployment.yaml
@@ -8,8 +8,8 @@ metadata:
     {{- with .Values.deployment.labels}}
     {{- toYaml . | nindent 4}}
     {{- end}}
-  {{- with .Values.deployment.annotations}}
   annotations:
+  {{- with .Values.deployment.annotations}}
     {{- toYaml . | nindent 4}}
   {{- end}}
 spec:
@@ -27,8 +27,8 @@ spec:
       {{- end}}
       labels:
         {{- include "kminion.selectorLabels" . | nindent 8}}
-        {{- if .Values.podLabels -}}
-        {{toYaml .Values.podLabels | nindent 8}}
+        {{- if .Values.customLabels -}}
+        {{toYaml .Values.customLabels | nindent 8}}
         {{- end}}
     spec:
       {{- with .Values.imagePullSecrets}}

diff --git a/charts/kminion/values.yaml b/charts/kminion/values.yaml
@@ -28,8 +28,6 @@ podAnnotations: {}
 #  prometheus.io/port: "8080"
 #  prometheus.io/path: "/metrics"
 
-podLabels: {}
-
 podSecurityContext:
   runAsUser: 99
   fsGroup: 99
@@ -91,7 +89,7 @@ tolerations: []
 
 affinity: {}
 
-
+customLabels: {}
 
 serviceMonitor:
   create: false