test

VictoriaMetrics · Sep 6, 2024 · c721dd3 · c721dd3
1 parent f6c68c6
commit c721dd3
Show file tree

Hide file tree

Showing 52 changed files with 285 additions and 406 deletions.
diff --git a/charts/victoria-logs-single/templates/server-deployment.yaml b/charts/victoria-logs-single/templates/server-deployment.yaml
@@ -13,8 +13,7 @@ metadata:
   labels: {{ include "victoria-logs.server.labels" $ctx | nindent 4 }}
 spec:
   selector:
-    {{- $_ := unset $ctx "extraLabels" }}
-    matchLabels: {{ include "victoria-logs.server.matchLabels" $ctx | nindent 6 }}
+    matchLabels: {{ include "victoria-logs.server.matchLabels" (omit $ctx "extraLabels") | nindent 6 }}
   replicas: 1
   {{- if $app.persistentVolume.enabled }}
   strategy:

diff --git a/charts/victoria-logs-single/templates/server-service.yaml b/charts/victoria-logs-single/templates/server-service.yaml
@@ -48,6 +48,5 @@ spec:
       {{- with $app.service.nodePort }}
       nodePort: {{ . }}
       {{- end }}
-  {{- $_ := unset $ctx "extraLabels" }}
-  selector: {{ include "victoria-logs.server.matchLabels" $ctx | nindent 4 }}
+  selector: {{ include "victoria-logs.server.matchLabels" (omit $ctx "extraLabels") | nindent 4 }}
 {{- end }}
diff --git a/charts/victoria-logs-single/templates/server-statefulset.yaml b/charts/victoria-logs-single/templates/server-statefulset.yaml
@@ -14,8 +14,7 @@ metadata:
 spec:
   serviceName: {{ $fullname }}
   selector:
-    {{- $_ := unset $ctx "extraLabels" }}
-    matchLabels: {{ include "victoria-logs.server.matchLabels" $ctx | nindent 6 }}
+    matchLabels: {{ include "victoria-logs.server.matchLabels" (omit $ctx "extraLabels") | nindent 6 }}
   replicas: 1
   podManagementPolicy: {{ $app.podManagementPolicy }}
   template:

diff --git a/charts/victoria-metrics-agent/templates/deployment.yaml b/charts/victoria-metrics-agent/templates/deployment.yaml
@@ -17,8 +17,7 @@ spec:
   strategy: {{ toYaml . | nindent 4 }}
   {{- end }}
   selector:
-    {{- $_ := unset $ctx "extraLabels" }}
-    matchLabels: {{ include "chart.selectorLabels" $ctx | nindent 6 }}
+    matchLabels: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 6 }}
   template:
     metadata:
       {{- $_ := set $ctx "extraLabels" (merge (deepCopy .Values.extraLabels) (deepCopy .Values.podLabels)) }}
@@ -128,12 +127,11 @@ spec:
       {{- end }}
       {{- with .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
-        {{- $_ := unset $ctx "extraLabels" }}
         {{- range $constraint := . }}
         - {{ toYaml $constraint | nindent 10 | trim }}
           {{- if not $constraint.labelSelector }}
           labelSelector:
-            matchLabels: {{ include "chart.selectorLabels" $ctx | nindent 14 }}
+            matchLabels: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 14 }}
           {{- end }}
         {{- end }}
       {{- end }}

diff --git a/charts/victoria-metrics-agent/templates/pdb.yaml b/charts/victoria-metrics-agent/templates/pdb.yaml
@@ -14,6 +14,5 @@ spec:
   maxUnavailable: {{ . }}
   {{- end }}
   selector:
-    {{- $_ := unset $ctx "extraLabels" }}
-    matchLabels: {{ include "chart.selectorLabels" $ctx | nindent 6 }}
+    matchLabels: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 6 }}
 {{- end }}
diff --git a/charts/victoria-metrics-agent/templates/service-monitor.yaml b/charts/victoria-metrics-agent/templates/service-monitor.yaml
@@ -17,8 +17,7 @@ spec:
     matchNames:
       - {{ include "vm.namespace" . }}
   selector:
-    {{- $_ := unset $ctx "extraLabels" }}
-    matchLabels: {{ include "chart.selectorLabels" $ctx | nindent 6 }}
+    matchLabels: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 6 }}
   endpoints:
     - port: http
       {{- with $serviceMonitor.basicAuth }}

diff --git a/charts/victoria-metrics-agent/templates/service.yaml b/charts/victoria-metrics-agent/templates/service.yaml
@@ -78,6 +78,5 @@ spec:
       port: {{ include "vm.port.from.flag" (dict "flag" .) }}
       targetPort: opentsdb-tcp
     {{- end }}
-  {{- $_ := unset $ctx "extraLabels" }}
-  selector: {{ include "chart.selectorLabels" $ctx | nindent 4 }}
+  selector: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 4 }}
 {{- end }}
diff --git a/charts/victoria-metrics-agent/templates/statefulset.yaml b/charts/victoria-metrics-agent/templates/statefulset.yaml
@@ -18,8 +18,7 @@ spec:
   updateStrategy: {{ toYaml . | nindent 4 }}
   {{- end }}
   selector:
-    {{- $_ := unset $ctx "extraLabels" }}
-    matchLabels: {{ include "chart.selectorLabels" $ctx | nindent 6 }}
+    matchLabels: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 6 }}
   template:
     metadata:
       {{- $_ := set $ctx "extraLabels" (merge (deepCopy .Values.extraLabels) (deepCopy .Values.podLabels)) }}
@@ -138,12 +137,11 @@ spec:
       {{- end }}
       {{- with .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
-        {{- $_ := unset $ctx "extraLabels" }}
         {{- range $constraint := . }}
         - {{ toYaml $constraint | nindent 10 | trim }}
           {{- if not $constraint.labelSelector }}
           labelSelector:
-            matchLabels: {{ include "chart.selectorLabels" $ctx | nindent 14 }}
+            matchLabels: {{ include "chart.selectorLabels" (omit $ctx "extraLabels") | nindent 14 }}
           {{- end }}
         {{- end }}
       {{- end }}