[bitnami/thanos] feature: allow configuring labels for query ingress (#…

…32240)
bitnami · Mar 3, 2025 · a49eff3 · a49eff3
1 parent ce208fa
commit a49eff3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/bitnami/thanos/CHANGELOG.md b/bitnami/thanos/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 15.12.4 (2025-02-21)
+## 15.13.0 (2025-03-03)
 
-* [bitnami/thanos] Release 15.12.4 ([#32102](https://github.com/bitnami/charts/pull/32102))
+* [bitnami/thanos] feature: allow configuring labels for query ingress ([#32240](https://github.com/bitnami/charts/pull/32240))
+
+## <small>15.12.4 (2025-02-21)</small>
+
+* [bitnami/thanos] Release 15.12.4 (#32102) ([7063858](https://github.com/bitnami/charts/commit/7063858b70a50657dcd25755270cafd12b74b86f)), closes [#32102](https://github.com/bitnami/charts/issues/32102)
 
 ## <small>15.12.3 (2025-02-14)</small>
 

diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml
@@ -35,4 +35,4 @@ maintainers:
 name: thanos
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/thanos
-version: 15.12.4
+version: 15.13.0
diff --git a/bitnami/thanos/README.md b/bitnami/thanos/README.md
@@ -558,6 +558,7 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru
 | `query.ingress.hostname`                                  | Default host for the ingress resource                                                                                                                                                                                         | `thanos.local`           |
 | `query.ingress.secretName`                                | Custom secretName for the ingress resource                                                                                                                                                                                    | `""`                     |
 | `query.ingress.ingressClassName`                          | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)                                                                                                                                                 | `""`                     |
+| `query.ingress.labels`                                    | Additional label for the Ingress resource.                                                                                                                                                                                    | `{}`                     |
 | `query.ingress.annotations`                               | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations.                                                                                              | `{}`                     |
 | `query.ingress.extraHosts`                                | The list of additional hostnames to be covered with this ingress record.                                                                                                                                                      | `[]`                     |
 | `query.ingress.extraTls`                                  | The tls configuration for additional hostnames to be covered with this ingress record.                                                                                                                                        | `[]`                     |

diff --git a/bitnami/thanos/templates/query/ingress.yaml b/bitnami/thanos/templates/query/ingress.yaml
@@ -9,7 +9,8 @@ kind: Ingress
 metadata:
   name: {{ include "thanos.query.fullname" . }}
   namespace: {{ include "common.names.namespace" . }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.labels .Values.commonLabels ) "context" . ) }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: query
   {{- if or .Values.query.ingress.annotations .Values.commonAnnotations }}
   {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.annotations .Values.commonAnnotations ) "context" . ) }}

diff --git a/bitnami/thanos/values.yaml b/bitnami/thanos/values.yaml
@@ -761,6 +761,13 @@ query:
     ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/
     ##
     ingressClassName: ""
+    ## @param query.ingress.labels Additional label for the Ingress resource. 
+    ## Use this parameter to set the required labels for your needs
+    ## e.g:
+    ## labels:
+    ##   dns-managed-by-external-dns: 'true'
+    ##
+    labels: {}    
     ## @param query.ingress.annotations Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations.
     ## For a full list of possible ingress annotations, please see
     ## ref: https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md