fix(thanos): clone of #1317

thanos/README.md

@@ -347,7 +347,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.compactor.enabled | bool | `true` | Enable Thanos Compactor component |
 | thanos.compactor.httpGracePeriod | string | 120s | Set Thanos Compactor http-grace-period |
 | thanos.compactor.logLevel | string | info | Thanos Compactor log level |
-| thanos.compactor.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 Compactor container. |
+| thanos.compactor.resources | object | `{}` | Resource requests and limits for the Thanos Compactor container. |
 | thanos.compactor.retentionResolution1h | string | 157680000s | Set Thanos Compactor retention.resolution-1h |
 | thanos.compactor.retentionResolution5m | string | 7776000s | Set Thanos Compactor retention.resolution-5m |
 | thanos.compactor.retentionResolutionRaw | string | 7776000s | Set Thanos Compactor retention.resolution-raw |
@@ -388,7 +388,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | 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.resources | object | `{}` | 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.stores | list | `[]` | Thanos Query store endpoints |
@@ -414,7 +414,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.ruler.objectStorageConfig.existingSecret | object | `{}` |  |
 | thanos.ruler.replicaLabel | string | `"thanos_ruler_replica"` | Set Thanos Rule replica-label. Only change this when you also guarantee to add the same as an external label with a value of `"$(POD_NAME)"` |
 | thanos.ruler.replicas | int | `1` | Set Thanos Ruler replica count |
-| thanos.ruler.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 Ruler container. |
+| thanos.ruler.resources | object | `{}` | Resource requests and limits for the Thanos Ruler container. |
 | thanos.ruler.retention | string | `"24h"` | Time duration ThanosRuler shall retain data for. Default is ‘24h’, and must match the regular expression [0-9]+(ms|s|m|h|d|w|y) (milliseconds seconds minutes hours days weeks years). |
 | thanos.ruler.ruleNamespaceSelector | object | `{}` | If {} it is selecting all namespaces. Otherwise MatchExpressions or MatchLabels have to be used  |
 | thanos.ruler.ruleSelector | string | `nil` | Matches to thanos-ruler: $matchLabel by default. Usually needs to be changed if a custom ruler is deployed  |
@@ -434,6 +434,6 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.store.enabled | bool | `true` | Enable Thanos Store component |
 | thanos.store.indexCacheSize | string | 1GB | Set Thanos Store index-cache-size |
 | thanos.store.logLevel | string | info | Thanos Store log level |
-| thanos.store.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 Store container. |
+| thanos.store.resources | object | `{"requests":{"ephemeral-storage":"200Mi"}}` | Resource requests and limits for the Thanos Store container. |
 | thanos.store.serviceAnnotations | object | `{}` | Service specific annotations to add to the Thanos Store service in addition to its already configured annotations. |
 | thanos.store.serviceLabels | object | `{}` | Labels to add to the Thanos Store service |

thanos/charts/Chart.yaml

@@ -11,7 +11,7 @@ maintainers:
 name: thanos
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 0.7.5
+version: 0.7.6
 keywords:
   - thanos
   - storage

thanos/charts/templates/compactor/deployment.yaml

@@ -65,8 +65,10 @@ spec:
           readOnly: true
         - mountPath: /data
           name: data-volume
+        {{- with .Values.thanos.compactor.resources }}
         resources:
-          {{- toYaml .Values.thanos.compactor.resources | nindent 10 }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       initContainers:
         - name: init-permissions
           {{- $registry := .Values.global.imageRegistry | default .Values.thanos.initChownData.image.registry -}}

thanos/charts/templates/query/deployment.yaml

@@ -81,8 +81,10 @@ spec:
         - containerPort: 10901
           name: grpc
           protocol: TCP
+        {{- with .Values.thanos.query.resources }}
         resources:
-          {{- toYaml .Values.thanos.query.resources | nindent 10 }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         readinessProbe:
           failureThreshold: 2
           httpGet:

thanos/charts/templates/ruler/ruler.yaml

@@ -42,8 +42,10 @@ spec:
       {{- include "thanos.labels" . | nindent 6 }}
   evaluationInterval: {{ .Values.thanos.ruler.evaluationInterval }}
   logLevel: {{ default "info" .Values.thanos.ruler.logLevel }}
+  {{- with .Values.thanos.ruler.resources }}
   resources:
-    {{- toYaml .Values.thanos.ruler.resources | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   retention: {{ .Values.thanos.ruler.retention }}
   {{- if .Values.thanos.ruler.storage }}
   storage:

thanos/charts/templates/store/deployment.yaml

@@ -60,8 +60,10 @@ spec:
           periodSeconds: 30
           successThreshold: 1
           timeoutSeconds: 5
+        {{- with .Values.thanos.store.resources }}
         resources:
-          {{- toYaml .Values.thanos.store.resources | nindent 10 }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         ports:
         - containerPort: 10902
           name: http

thanos/charts/values.yaml

@@ -86,14 +86,7 @@ thanos:
       routePrefix:
 
     # -- Resource requests and limits for the Thanos Query container.
-    # @default -- <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre>
-    resources:
-      requests:
-        cpu:
-        memory:
-      limits:
-        cpu:
-        memory:
+    resources: {}
 
     # -- Adding additional arguments to Thanos Query
     additionalArgs: []
@@ -216,15 +209,9 @@ thanos:
     enabled: true
 
     # -- Resource requests and limits for the Thanos Store container.
-    # @default -- <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre>
     resources:
       requests:
-        cpu:
-        memory:
         ephemeral-storage: 200Mi
-      limits:
-        cpu:
-        memory:
 
     # -- Adding additional arguments to Thanos Store
     additionalArgs: []
@@ -267,14 +254,7 @@ thanos:
     logLevel:
 
     # -- Resource requests and limits for the Thanos Compactor container.
-    # @default -- <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre>
-    resources:
-      requests:
-        cpu:
-        memory:
-      limits:
-        cpu:
-        memory:
+    resources: {}
 
     # -- Labels to add to the Thanos Compactor deployment
     deploymentLabels: {}
@@ -396,14 +376,7 @@ thanos:
         # key: object-storage-configs.yaml
 
     # -- Resource requests and limits for the Thanos Ruler container.
-    # @default -- <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre>
-    resources:
-      requests:
-        cpu:
-        memory:
-      limits:
-        cpu:
-        memory:
+    resources: {}
 
     # -- If {} it is selecting all namespaces. Otherwise MatchExpressions or MatchLabels have to be used 
     ruleNamespaceSelector: {}

thanos/plugindefinition.yaml

@@ -6,12 +6,12 @@ kind: PluginDefinition
 metadata:
   name: thanos
 spec:
-  version: 0.7.5
+  version: 0.7.6
   description: thanos
   helmChart:
     name: thanos
     repository: "oci://ghcr.io/cloudoperators/greenhouse-extensions/charts"
-    version: 0.7.5
+    version: 0.7.6
   options:
     - default: null
       description: CLI param for Thanos Query