fix(thanos): Fixed extra volume logic (#921)

Signed-off-by: Steve Hipwell <[email protected]>
stevehipwell · Apr 4, 2024 · 1e23fc9 · 1e23fc9
1 parent 9261802
commit 1e23fc9
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 8 deletions.
diff --git a/charts/thanos/CHANGELOG.md b/charts/thanos/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v1.16.3] - 2024-04-04
+
+### Fixed
+
+- Fixed bug introduced as part of adding extra volume support.
+
 ## [v1.16.2] - 2024-04-04
 
 ### Added
@@ -454,6 +460,7 @@
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/thanos
+[v1.16.3]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.3
 [v1.16.2]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.2
 [v1.16.1]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.1
 [v1.16.0]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.16.0

diff --git a/charts/thanos/Chart.yaml b/charts/thanos/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: thanos
 description: Helm chart to install Thanos; a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments.
 type: application
-version: 1.16.2
+version: 1.16.3
 appVersion: 0.34.1
 keywords:
   - kubernetes
@@ -22,5 +22,5 @@ maintainers:
     email: [email protected]
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: "Added support for setting `extraVolumes` & `extraVolumeMounts` for each component."
+    - kind: fixed
+      description: "Fixed bug introduced as part of adding extra volume support."
diff --git a/charts/thanos/README.md b/charts/thanos/README.md
@@ -1,6 +1,6 @@
 # thanos
 
-![Version: 1.16.2](https://img.shields.io/badge/Version-1.16.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.34.1](https://img.shields.io/badge/AppVersion-0.34.1-informational?style=flat-square)
+![Version: 1.16.3](https://img.shields.io/badge/Version-1.16.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.34.1](https://img.shields.io/badge/AppVersion-0.34.1-informational?style=flat-square)
 
 Helm chart to install Thanos; a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments.
 
@@ -25,15 +25,15 @@ Helm chart to install Thanos; a set of components that can be composed into a hi
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install thanos oci://ghcr.io/stevehipwell/helm-charts/thanos --version 1.16.2
+helm upgrade --install thanos oci://ghcr.io/stevehipwell/helm-charts/thanos --version 1.16.3
 ```
 
 #### Verification
 
 As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command.
 
 ```shell
-cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/thanos:1.16.2
+cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/thanos:1.16.3
 ```
 
 ### Non-OCI Repository
@@ -42,7 +42,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install thanos stevehipwell/thanos --version 1.16.2
+helm upgrade --install thanos stevehipwell/thanos --version 1.16.3
 ```
 
 ## Values

diff --git a/charts/thanos/ci/kubeconform.yaml b/charts/thanos/ci/kubeconform.yaml
@@ -10,6 +10,14 @@ additionalReplicaLabels:
 compact:
   enabled: true
 
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1024Mi
+    limits:
+      cpu: 1000m
+      memory: 1024Mi
+
   persistence:
     enabled: true
 
@@ -51,6 +59,14 @@ query:
     enabled: true
     minAvailable: 1
 
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1024Mi
+    limits:
+      cpu: 1000m
+      memory: 1024Mi
+
   extraVolumes:
     - name: test
       configMap:
@@ -97,6 +113,14 @@ queryFrontend:
           - query.chart-example.local
         secretName: chart-example-tls
 
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1024Mi
+    limits:
+      cpu: 1000m
+      memory: 1024Mi
+
   extraVolumes:
     - name: test
       configMap:
@@ -134,6 +158,14 @@ receive:
     persistence:
       enabled: true
 
+    resources:
+      requests:
+        cpu: 500m
+        memory: 1024Mi
+      limits:
+        cpu: 1000m
+        memory: 1024Mi
+
     extraVolumes:
       - name: test
         configMap:
@@ -178,6 +210,14 @@ receive:
             - router.chart-example.local
           secretName: chart-example-tls
 
+    resources:
+      requests:
+        cpu: 500m
+        memory: 1024Mi
+      limits:
+        cpu: 1000m
+        memory: 1024Mi
+
     extraVolumes:
       - name: test
         configMap:
@@ -211,6 +251,14 @@ rule:
     enabled: true
     minAvailable: 1
 
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1024Mi
+    limits:
+      cpu: 1000m
+      memory: 1024Mi
+
   persistence:
     enabled: true
 
@@ -253,6 +301,14 @@ storeGateway:
     enabled: true
     minAvailable: 1
 
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1024Mi
+    limits:
+      cpu: 1000m
+      memory: 1024Mi
+
   persistence:
     enabled: true
 

diff --git a/charts/thanos/templates/query/deployment.yaml b/charts/thanos/templates/query/deployment.yaml
@@ -92,11 +92,11 @@ spec:
             {{- toYaml .Values.query.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.query.readinessProbe | nindent 12 }}
-          {{- with .Values.query.resources }}
           {{- with .Values.query.extraVolumeMounts }}
           volumeMounts:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.query.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}