feat(thanos): remove standalone ref + update docs (#1100)

trouaux · web-flow · commit 7c2bbb468ed0 · 2025-09-05T10:47:27.000+02:00
* thanos chart + docs cleanup

* patch

* sd-config fix templating

* minor version
diff --git a/thanos/README.md b/thanos/README.md
@@ -170,19 +170,21 @@ Thanos Query would check for a Thanos endpoint named like `releaseName-store`. T
 
 `--store=thanos-kube-store:10901`
 
-If you just have one occurence of this Thanos plugin dpeloyed, the default option would work and does not need anything else.
+If you just have one occurence of this Thanos plugin deployed, the default option would work and does not need anything else.
 
 ### Standalone Query
 
 ![Standalone Query](img/thanos_standalone_query.png)
 
-In case you want to achieve a setup like above and have an overarching Thanos Query to run with multiple Stores, you can set it to `standalone` and add your own store list. Setup your Plugin like this:
+In case you want to achieve a setup like above and have an overarching Thanos Query to run with multiple Stores, you can disable all other thanos components and add your own store list. Setup your Plugin like this:
 
 ```yaml
 spec:
   optionsValues:
-  - name: thanos.query.standalone
-    value: true
+  - name: thanos.store.enabled
+    value: false
+  - name: thanos.compactor.enabled
+    value: false
 ```
 
 This would enable you to either:
@@ -260,7 +262,7 @@ It is possible to disable certain Thanos components for your deployment. To do s
 
 | Thanos Component | Enabled by default	 | Deactivatable | Flag |
 |---|---|---|---|
-| Query | True | False | n/a |
+| Query | True | True | thanos.query.enabled |
 | Store | True | True | thanos.store.enabled |
 | Compactor | True | True | thanos.compactor.enabled |
 | Ruler | False | True | thanos.ruler.enabled |
@@ -381,16 +383,15 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.query.persesDatasource.create | bool | `true` | Creates a Perses datasource for Thanos Query |
 | thanos.query.persesDatasource.isDefault | bool | `true` | set datasource as default for Perses. Consider setting this to `false` only if you have another (default) datasource for Perses already. |
 | thanos.query.persesDatasource.selector | object | `{}` | Label selectors for the Perses sidecar to detect this datasource. |
-| thanos.query.plutonoDatasource.create | bool | `false` | Creates a Perses datasource for standalone Thanos Query |
+| thanos.query.plutonoDatasource.create | bool | `false` | Creates a Perses datasource for Thanos Query |
 | thanos.query.plutonoDatasource.isDefault | bool | `false` | set datasource as default for Plutono |
 | thanos.query.plutonoDatasource.selector | object | `{}` | Label selectors for the Plutono sidecar to detect this datasource. |
 | thanos.query.replicaLabel | string | `"prometheus_replica"` | Set Thanos Query replica-label for Prometheus replicas |
 | thanos.query.replicas | string | `nil` | Number of Thanos Query replicas to deploy |
 | thanos.query.resources | object | <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre> | Resource requests and limits for the Thanos Query container. |
 | thanos.query.serviceAnnotations | object | `{}` | Service specific annotations to add to the Thanos Query service in addition to its already configured annotations. |
 | thanos.query.serviceLabels | object | `{}` | Labels to add to the Thanos Query service |
-| thanos.query.standalone | bool | `false` |  |
-| thanos.query.stores | list | `[]` |  |
+| thanos.query.stores | list | `[]` | Thanos Query store endpoints |
 | thanos.query.tls.data | object | `{}` |  |
 | thanos.query.tls.secretName | string | `""` |  |
 | thanos.query.web.externalPrefix | string | `nil` |  |
diff --git a/thanos/README.md.gotmpl b/thanos/README.md.gotmpl
@@ -170,19 +170,21 @@ Thanos Query would check for a Thanos endpoint named like `releaseName-store`. T
 
 `--store=thanos-kube-store:10901`
 
-If you just have one occurence of this Thanos plugin dpeloyed, the default option would work and does not need anything else.
+If you just have one occurence of this Thanos plugin deployed, the default option would work and does not need anything else.
 
 ### Standalone Query
 
 ![Standalone Query](img/thanos_standalone_query.png)
 
-In case you want to achieve a setup like above and have an overarching Thanos Query to run with multiple Stores, you can set it to `standalone` and add your own store list. Setup your Plugin like this:
+In case you want to achieve a setup like above and have an overarching Thanos Query to run with multiple Stores, you can disable all other thanos components and add your own store list. Setup your Plugin like this:
 
 ```yaml
 spec:
   optionsValues:
-  - name: thanos.query.standalone
-    value: true
+  - name: thanos.store.enabled
+    value: false
+  - name: thanos.compactor.enabled
+    value: false
 ```
 
 This would enable you to either:
@@ -260,7 +262,7 @@ It is possible to disable certain Thanos components for your deployment. To do s
 
 | Thanos Component | Enabled by default	 | Deactivatable | Flag |
 |---|---|---|---|
-| Query | True | False | n/a |
+| Query | True | True | thanos.query.enabled |
 | Store | True | True | thanos.store.enabled |
 | Compactor | True | True | thanos.compactor.enabled |
 | Ruler | False | True | thanos.ruler.enabled |
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.6.5
+version: 0.7.0
 keywords:
   - thanos
   - storage
diff --git a/thanos/charts/templates/compactor/deployment.yaml b/thanos/charts/templates/compactor/deployment.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.thanos.compactor.enabled (not .Values.thanos.query.standalone) }}
+{{ if and .Values.thanos.compactor.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/thanos/charts/templates/compactor/pvc.yaml b/thanos/charts/templates/compactor/pvc.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.thanos.compactor.enabled (not .Values.thanos.query.standalone) }}
+{{ if and .Values.thanos.compactor.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
diff --git a/thanos/charts/templates/compactor/service.yaml b/thanos/charts/templates/compactor/service.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.thanos.compactor.enabled (not .Values.thanos.query.standalone) }}
+{{ if and .Values.thanos.compactor.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/thanos/charts/templates/query/sd-config.yaml b/thanos/charts/templates/query/sd-config.yaml
@@ -13,14 +13,11 @@ data:
   endpoint-targets.yaml: |-
     endpoints:
 {{- /* Technically it is possible to add stores and have the default stores all together.*/}}
-{{- /* Enabling standalone would remove the default stores for an empty store list to be maintained entirely manual.*/}}
-{{- if and (empty .Values.thanos.query.stores) (.Values.thanos.query.standalone) }}
-{{- fail "WARNING Thanos Query will have no data. Either unset thanos.query.standalone or specify thanos.query.stores." -}}
-{{- end }}
+{{- if not (empty .Values.thanos.query.stores) }}
 {{- range .Values.thanos.query.stores }}
       - address: "{{ . }}"
 {{- end -}}
-{{- if not .Values.thanos.query.standalone }}
+{{- else }}
       - address: "prometheus-operated:10901"
       - address: "{{ include "release.name" . }}-store:{{ default "10901" .Values.thanos.grpcAddress }}"
 {{- end }}
diff --git a/thanos/charts/templates/store/deployment.yaml b/thanos/charts/templates/store/deployment.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.thanos.store.enabled (not .Values.thanos.query.standalone) }}
+{{ if and .Values.thanos.store.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/thanos/charts/templates/store/service.yaml b/thanos/charts/templates/store/service.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.thanos.store.enabled (not .Values.thanos.query.standalone) }}
+{{ if and .Values.thanos.store.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/thanos/charts/templates/tests/test-thanos-config.yaml b/thanos/charts/templates/tests/test-thanos-config.yaml
@@ -23,6 +23,7 @@ data:
       verify "there is 1 service named '{{ .Release.Name }}-query'"
       verify "there is 1 configmap named '{{ .Release.Name }}-sd-config'"
       try "at most 3 times every 5s to get pods named '{{ .Release.Name }}-query' and verify that '.status.phase' is 'running'"
+      try "at most 3 times every 5s to get pods named 'prometheus-.*-[0-9]$' and verify that '.status.containerStatuses[*].name' is 'config-reloader,prometheus,thanos-sidecar'"
 
       endpoints=$(kubectl get cm {{ .Release.Name }}-sd-config -oyaml | yq '.data["endpoint-targets.yaml"] | select(. != null)' | yq '.endpoints[].address')
       for endpoint in $endpoints; do
@@ -37,15 +38,15 @@ data:
       done
     }
 
-    {{ if and .Values.thanos.store.enabled (not .Values.thanos.query.standalone) }}
+    {{ if and .Values.thanos.store.enabled }}
     @test "Verify {{ .Release.Name }} Store" {
       verify "there is 1 deployment named '{{ .Release.Name }}-store'"
       verify "there is 1 service named '{{ .Release.Name }}-store'"
       try "at most 3 times every 5s to get pods named '{{ .Release.Name }}-store' and verify that '.status.phase' is 'running'"
     }
     {{ end }}
 
-    {{ if and .Values.thanos.compactor.enabled (not .Values.thanos.query.standalone) }}
+    {{ if and .Values.thanos.compactor.enabled }}
     @test "Verify {{ .Release.Name }} Compactor" {
       verify "there is 1 deployment named '{{ .Release.Name }}-compactor'"
       verify "there is 1 service named '{{ .Release.Name }}-compactor'"
@@ -76,12 +77,6 @@ data:
     }
     {{ end }}
 
-    {{ if (not .Values.thanos.query.standalone) }}
-    @test "Verify prometheus sidecar is running" {
-      try "at most 3 times every 5s to get pods named 'prometheus-.*-[0-9]$' and verify that '.status.containerStatuses[*].name' is 'config-reloader,prometheus,thanos-sidecar'"
-    }
-    {{ end }}
-
     {{- if and .Values.thanos.query.ingress.grpc.enabled .Values.thanos.query.ingress.grpc.hosts .Values.thanos.query.ingress.grpc.tls (not .Values.ci.enabled ) }}
     @test "Verify the availability of the Thanos Query API Ingress hostname by using the created certificates" {
       url="{{ (first .Values.thanos.query.ingress.grpc.hosts).host }}:443"
diff --git a/thanos/charts/values.yaml b/thanos/charts/values.yaml
@@ -75,10 +75,6 @@ thanos:
     # @default -- info
     logLevel:
 
-    # Disables standard prometheus-operated and Thanos Store endpoints
-    # To be used for overarching Thanos Queries with custom endpoint lists
-    standalone: false
-
     # -- Set Thanos Query auto-downsampling
     autoDownsampling: true
 
@@ -118,7 +114,7 @@ thanos:
     # -- Annotations to add to the Thanos Query resources
     annotations: {}
 
-    # if this is a standalone query, store endpoints need to be added here, otherwise the query does nothing.
+    # -- Thanos Query store endpoints
     stores: []
 
     # Configure the ingress resource that allows you to access Thanos Query
@@ -192,7 +188,7 @@ thanos:
 
     ## Expose Thanos Query as a Plutono datasource
     plutonoDatasource:
-      # -- Creates a Perses datasource for standalone Thanos Query
+      # -- Creates a Perses datasource for Thanos Query
       create: false
 
       # -- set datasource as default for Plutono
diff --git a/thanos/plugindefinition.yaml b/thanos/plugindefinition.yaml
@@ -6,12 +6,12 @@ kind: PluginDefinition
 metadata:
   name: thanos
 spec:
-  version: 0.6.5
+  version: 0.7.0
   description: thanos
   helmChart:
     name: thanos
     repository: "oci://ghcr.io/cloudoperators/greenhouse-extensions/charts"
-    version: 0.6.5
+    version: 0.7.0
   options:
     - default: null
       description: CLI param for Thanos Query
@@ -81,11 +81,6 @@ spec:
       name: thanos.query.serviceAnnotations
       required: false
       type: map
-    - default: false
-      description: Removes standard Thanos endpoints for overarching Queries
-      name: thanos.query.standalone
-      required: false
-      type: bool
     - description: Existing Secret containing the tls certificates and private keys
       name: thanos.query.tls.secretName
       required: false
@@ -140,7 +135,7 @@ spec:
       required: false
       type: bool
     - default: []
-      description: Automatically filled if Query is not standalone. If multiple Prometheis are deployed, all Prometheus, Thanos Query and Thanos Store services need to be added to this list manually e.g. kube-monitoring-prometheus:10901 or thanos-store:10901.
+      description: If multiple Prometheus instances are deployed, all Prometheus, Thanos Query and Thanos Store services need to be added to this list manually e.g. kube-monitoring-prometheus:10901 or thanos-store:10901.
       name: thanos.query.stores
       required: false
       type: list

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{ if and .Values.thanos.compactor.enabled (not .Values.thanos.query.standalone) }}`
	`1`	`+{{ if and .Values.thanos.compactor.enabled }}`
`2`	`2`	`apiVersion: apps/v1`
`3`	`3`	`kind: Deployment`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{ if and .Values.thanos.store.enabled (not .Values.thanos.query.standalone) }}`
	`1`	`+{{ if and .Values.thanos.store.enabled }}`
`2`	`2`	`apiVersion: apps/v1`
`3`	`3`	`kind: Deployment`
`4`	`4`	`metadata:`