helm: don't quote container command args passed via *.extraArgs values (

#10029) * helm: don't quote args passed via extraArgs values Signed-off-by: Vladimir Varankin <[email protected]> * update CHANGELOG Signed-off-by: Vladimir Varankin <[email protected]> * add tests for extraArgs values Signed-off-by: Vladimir Varankin <[email protected]> * fixup! update CHANGELOG --------- Signed-off-by: Vladimir Varankin <[email protected]>
grafana · Nov 28, 2024 · b1ae3b9 · b1ae3b9
1 parent b941204
commit b1ae3b9
Show file tree

Hide file tree

Showing 85 changed files with 4,131 additions and 23 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -29,13 +29,14 @@ Entries should include a reference to the Pull Request that introduced the chang
 
 ## main / unreleased
 
-* [BUGFIX] Update `serviceAccountName` in the `alertmanager-statefulset` template. #10016
 * [CHANGE] Update rollout-operator version to 0.20.0. #9995
 * [CHANGE] Remove the `track_sizes` feature for Memcached pods since it is unused. #10032
 * [FEATURE] Add support for GEM's federation-frontend. See the `federation_frontend` section in the values file. #9673
 * [ENHANCEMENT] Add support for setting type and internal traffic policy for Kubernetes service. Set `internalTrafficPolicy=Cluster` by default in all services with type `ClusterIP`. #9619
 * [ENHANCEMENT] Add the possibility to create a dedicated serviceAccount for the `alertmanager` component by setting `alertmanager.serviceAcount.create` to true in the values. #9781
 * [ENHANCEMENT] helm: add `enabled` field for admin-api, compactor, distributor, gateway, ingester, querier, query-frontend and store-gateway components. This helps when deploying the GEM federation-frontend on its own. #9734
+* [BUGFIX] Do not quote container command args passed via *.extraArgs values. #10029
+* [BUGFIX] Update `serviceAccountName` in the `alertmanager-statefulset` template. #10016
 * [BUGFIX] Fix PVC template in AlertManager to not show diff in ArgoCD. #9774
 * [BUGFIX] Fix how `fullnameOverride` is reflected in generated manifests. #9564
 * [BUGFIX] Fix `extraObjects` linting with helm lint by padding with an extra new line. #9863

diff --git a/operations/helm/charts/mimir-distributed/ci/offline/test-extra-args-values.yaml b/operations/helm/charts/mimir-distributed/ci/offline/test-extra-args-values.yaml
@@ -0,0 +1,54 @@
+# Pin kube version so results are the same for running in CI and locally where the installed kube version may be different.
+kubeVersionOverride: "1.20"
+
+test_extra_args: &test_extra_args
+  extraArgs:
+    flag-empty: null
+    flag-string: hello
+    flag-bool: false
+    flag-float: 1.23
+    flag-json1: "{\"foo\":\"bar\"}"
+    flag-json2: '{"foo":"bar"}'
+    flag-number: 0
+
+admin_api:
+  <<: *test_extra_args
+
+alertmanager:
+  <<: *test_extra_args
+
+compactor:
+  <<: *test_extra_args
+
+continuous_test:
+  <<: *test_extra_args
+
+distributor:
+  <<: *test_extra_args
+
+gateway:
+  <<: *test_extra_args
+
+overrides_exporter:
+  <<: *test_extra_args
+
+query_frontend:
+  <<: *test_extra_args
+
+query_scheduler:
+  <<: *test_extra_args
+
+ruler:
+  <<: *test_extra_args
+
+ruler_querier:
+  <<: *test_extra_args
+
+ruler_query_scheduler:
+  <<: *test_extra_args
+
+smoke_test:
+  <<: *test_extra_args
+
+store_gateway:
+  <<: *test_extra_args
diff --git a/operations/helm/charts/mimir-distributed/templates/admin-api/admin-api-dep.yaml b/operations/helm/charts/mimir-distributed/templates/admin-api/admin-api-dep.yaml
@@ -48,7 +48,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
             {{- range $key, $value := .Values.admin_api.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.admin_api.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-dep.yaml b/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-dep.yaml
@@ -52,7 +52,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
           {{- range $key, $value := .Values.alertmanager.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.alertmanager.extraVolumeMounts }}

diff --git a/...ations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...ations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -153,7 +153,7 @@ spec:
             # needs to be higher to avoid connections being closed abruptly.
             - "-server.http-idle-timeout=6m"
             {{- range $key, $value := .Values.alertmanager.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.alertmanager.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/compactor/compactor-statefulset.yaml b/operations/helm/charts/mimir-distributed/templates/compactor/compactor-statefulset.yaml
@@ -122,7 +122,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
             {{- range $key, $value := .Values.compactor.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.compactor.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-dep.yaml b/operations/helm/charts/mimir-distributed/templates/continuous_test/continuous-test-dep.yaml
@@ -65,7 +65,7 @@ spec:
             - "-tests.bearer-token={{ .Values.continuous_test.auth.bearerToken }}"
             {{- end }}
             {{- range $key, $value := .Values.continuous_test.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             - name: config

diff --git a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -68,7 +68,7 @@ spec:
             {{- end }}
           {{- end }}
           {{- range $key, $value := .Values.distributor.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.distributor.extraVolumeMounts }}

diff --git a/.../helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-dep.yaml b/.../helm/charts/mimir-distributed/templates/federation-frontend/federation-frontend-dep.yaml
@@ -47,7 +47,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
             {{- range $key, $value := .Values.federation_frontend.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.federation_frontend.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/gateway/gateway-dep.yaml b/operations/helm/charts/mimir-distributed/templates/gateway/gateway-dep.yaml
@@ -59,7 +59,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
             {{- range $key, $value := .extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- with .extraVolumeMounts }}

diff --git a/...rts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-dep.yaml b/...rts/mimir-distributed/templates/graphite-proxy/graphite-querier/graphite-querier-dep.yaml
@@ -50,7 +50,7 @@ spec:
             - -target=graphite-querier
             - -config.file=/etc/mimir/mimir.yaml
           {{- range $key, $value := .Values.graphite.querier.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.graphite.querier.extraVolumeMounts }}

diff --git a/...r-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-dep.yaml b/...r-distributed/templates/graphite-proxy/graphite-write-proxy/graphite-write-proxy-dep.yaml
@@ -50,7 +50,7 @@ spec:
             - -target=graphite-write-proxy
             - -config.file=/etc/mimir/mimir.yaml
           {{- range $key, $value := .Values.graphite.write_proxy.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.graphite.write_proxy.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/ingester/ingester-statefulset.yaml b/operations/helm/charts/mimir-distributed/templates/ingester/ingester-statefulset.yaml
@@ -142,7 +142,7 @@ spec:
             - "-server.grpc-max-concurrent-streams=500"
             {{- end }}
             {{- range $key, $value := .Values.ingester.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.ingester.extraVolumeMounts }}

diff --git a/...ns/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml b/...ns/helm/charts/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml
@@ -48,7 +48,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
             {{- range $key, $value := .Values.overrides_exporter.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.overrides_exporter.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/querier/querier-dep.yaml b/operations/helm/charts/mimir-distributed/templates/querier/querier-dep.yaml
@@ -63,7 +63,7 @@ spec:
             {{- end }}
           {{- end }}
           {{- range $key, $value := .Values.querier.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.querier.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml b/operations/helm/charts/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml
@@ -56,7 +56,7 @@ spec:
             - "-server.grpc.keepalive.max-connection-age=30s"
             - "-shutdown-delay=90s"
           {{- range $key, $value := .Values.query_frontend.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.query_frontend.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-dep.yaml b/operations/helm/charts/mimir-distributed/templates/query-scheduler/query-scheduler-dep.yaml
@@ -47,7 +47,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
           {{- range $key, $value := .Values.query_scheduler.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.query_scheduler.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/ruler-querier/ruler-querier-dep.yaml b/operations/helm/charts/mimir-distributed/templates/ruler-querier/ruler-querier-dep.yaml
@@ -64,7 +64,7 @@ spec:
             {{- end }}
           {{- end }}
           {{- range $key, $value := .Values.ruler_querier.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.ruler_querier.extraVolumeMounts }}

diff --git a/...elm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-dep.yaml b/...elm/charts/mimir-distributed/templates/ruler-query-frontend/ruler-query-frontend-dep.yaml
@@ -58,7 +58,7 @@ spec:
             - "-server.grpc.keepalive.max-connection-age=30s"
             - "-shutdown-delay=90s"
           {{- range $key, $value := .Values.ruler_query_frontend.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.ruler_query_frontend.extraVolumeMounts }}

diff --git a/...m/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-dep.yaml b/...m/charts/mimir-distributed/templates/ruler-query-scheduler/ruler-query-scheduler-dep.yaml
@@ -47,7 +47,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
           {{- range $key, $value := .Values.ruler_query_scheduler.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.ruler_query_scheduler.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/charts/mimir-distributed/templates/ruler/ruler-dep.yaml
@@ -65,7 +65,7 @@ spec:
             {{- end }}
           {{- end }}
           {{- range $key, $value := .Values.ruler.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
           {{- end }}
           volumeMounts:
             {{- if .Values.ruler.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/smoke-test/smoke-test-job.yaml b/operations/helm/charts/mimir-distributed/templates/smoke-test/smoke-test-job.yaml
@@ -50,7 +50,7 @@ spec:
             - "-tests.write-read-series-test.max-query-age=48h"
             - "-server.http-listen-port={{ include "mimir.serverHttpListenPort" . }}"
             {{- range $key, $value := .Values.smoke_test.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.smoke_test.extraVolumeMounts }}

diff --git a/...ions/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/...ions/helm/charts/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml
@@ -140,7 +140,7 @@ spec:
             {{- end }}
             {{- end }}
             {{- range $key, $value := .Values.store_gateway.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.store_gateway.extraVolumeMounts }}

diff --git a/operations/helm/charts/mimir-distributed/templates/tokengen/tokengen-job.yaml b/operations/helm/charts/mimir-distributed/templates/tokengen/tokengen-job.yaml
@@ -47,7 +47,7 @@ spec:
             - "-config.expand-env=true"
             - "-config.file=/etc/mimir/mimir.yaml"
             {{- range $key, $value := .Values.tokengenJob.extraArgs }}
-            - "-{{ $key }}={{ $value }}"
+            - -{{ $key }}={{ $value }}
             {{- end }}
           volumeMounts:
             {{- if .Values.tokengenJob.extraVolumeMounts }}