fix(thanos): template line return fix (#1185)

trouaux · web-flow · commit 48cabb61cd3b · 2025-09-08T16:29:39.000+02:00
* fix templating line returns

* revert test

* fix value types
diff --git a/thanos/charts/Chart.yaml b/thanos/charts/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 name: thanos
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 0.7.0
+version: 0.7.1
 keywords:
   - thanos
   - storage
diff --git a/thanos/charts/ci/test-values.yaml b/thanos/charts/ci/test-values.yaml
@@ -6,6 +6,14 @@ blackboxExporter:
 
 thanos:
   query:
+    serviceLabels:
+      testServiceLabels: "true"
+    deploymentLabels:
+      testDeploymentLabels: "true"
+    persesDatasource:
+      create: "true"
+      selector:
+        persesDatasourceSelector: test
     stores:
       - prometheus-operated:10901
       - prometheus-operated:10901
diff --git a/thanos/charts/templates/compactor/deployment.yaml b/thanos/charts/templates/compactor/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.compactor.deploymentLabels }}
-    {{ toYaml .Values.thanos.compactor.deploymentLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.compactor.deploymentLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-compactor
 spec:
diff --git a/thanos/charts/templates/compactor/pvc.yaml b/thanos/charts/templates/compactor/pvc.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.compactor.volume.labels }}
-    {{ toYaml .Values.thanos.compactor.volume.labels | nindent 4 }}
+    {{- toYaml .Values.thanos.compactor.volume.labels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-compactor
 spec:
diff --git a/thanos/charts/templates/compactor/service.yaml b/thanos/charts/templates/compactor/service.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.compactor.serviceLabels }}
-    {{ toYaml .Values.thanos.compactor.serviceLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.compactor.serviceLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-compactor
 spec:
diff --git a/thanos/charts/templates/query/deployment.yaml b/thanos/charts/templates/query/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.query.deploymentLabels }}
-    {{ toYaml .Values.thanos.query.deploymentLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.query.deploymentLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-query
 spec:
diff --git a/thanos/charts/templates/query/sd-config.yaml b/thanos/charts/templates/query/sd-config.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}  
     {{- include "thanos.labels" . | nindent 4 }}  
     {{- if .Values.thanos.query.deploymentLabels }}  
-    {{ toYaml .Values.thanos.query.deploymentLabels | nindent 4 }}  
+    {{- toYaml .Values.thanos.query.deploymentLabels | nindent 4 }}  
     {{- end }}
 data:
   endpoint-targets.yaml: |-
diff --git a/thanos/charts/templates/query/service.yaml b/thanos/charts/templates/query/service.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.query.serviceLabels }}
-    {{ toYaml .Values.thanos.query.serviceLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.query.serviceLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-query
 spec:
diff --git a/thanos/charts/templates/ruler/ruler.yaml b/thanos/charts/templates/ruler/ruler.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.ruler.labels }}
-    {{ toYaml .Values.thanos.ruler.labels | nindent 4 }}
+    {{- toYaml .Values.thanos.ruler.labels | nindent 4 }}
     {{- end }}
 spec:
   affinity:
diff --git a/thanos/charts/templates/ruler/service.yaml b/thanos/charts/templates/ruler/service.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.ruler.serviceLabels }}
-    {{ toYaml .Values.thanos.ruler.serviceLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.ruler.serviceLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-ruler
 spec:
diff --git a/thanos/charts/templates/store/deployment.yaml b/thanos/charts/templates/store/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.store.deploymentLabels }}
-    {{ toYaml .Values.thanos.store.deploymentLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.store.deploymentLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-store
 spec:
diff --git a/thanos/charts/templates/store/service.yaml b/thanos/charts/templates/store/service.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- include "plugin.labels" . | nindent 4 }}
     {{- include "thanos.labels" . | nindent 4 }}
     {{- if .Values.thanos.store.serviceLabels }}
-    {{ toYaml .Values.thanos.store.serviceLabels | nindent 4 }}
+    {{- toYaml .Values.thanos.store.serviceLabels | nindent 4 }}
     {{- end }}
   name: {{ include "release.name" . }}-store
 spec:
diff --git a/thanos/plugindefinition.yaml b/thanos/plugindefinition.yaml
@@ -6,12 +6,12 @@ kind: PluginDefinition
 metadata:
   name: thanos
 spec:
-  version: 0.7.0
+  version: 0.7.1
   description: thanos
   helmChart:
     name: thanos
     repository: "oci://ghcr.io/cloudoperators/greenhouse-extensions/charts"
-    version: 0.7.0
+    version: 0.7.1
   options:
     - default: null
       description: CLI param for Thanos Query
