From a63bdc13365d6458d9f507ffe06dc2d1bed4bbc4 Mon Sep 17 00:00:00 2001 From: trouaux Date: Fri, 5 Jun 2026 13:10:08 +0200 Subject: [PATCH 1/3] template ingressClassName Signed-off-by: trouaux --- thanos/README.md | 2 +- thanos/charts/Chart.yaml | 2 +- thanos/charts/templates/query/ingress-grpc.yaml | 2 +- thanos/charts/templates/query/ingress.yaml | 2 +- thanos/charts/values.yaml | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/thanos/README.md b/thanos/README.md index 4d6c1ed26..13636929d 100644 --- a/thanos/README.md +++ b/thanos/README.md @@ -377,7 +377,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de | thanos.query.ingress.grpc.ingressClassName | string | `""` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)(GRPC) This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ | | thanos.query.ingress.grpc.tls | list | `[]` | Ingress TLS configuration. (GRPC) | | thanos.query.ingress.hosts | list | `[{"host":"thanos.local","paths":[{"path":"/","pathType":"Prefix","portName":"http"}]}]` | Default host for the ingress resource | -| thanos.query.ingress.ingressClassName | string | `""` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ | +| thanos.query.ingress.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ | | thanos.query.ingress.tls | list | `[]` | Ingress TLS configuration | | thanos.query.logLevel | string | info | Thanos Query log level | | thanos.query.persesDatasource.create | bool | `true` | Creates a Perses datasource for Thanos Query | diff --git a/thanos/charts/Chart.yaml b/thanos/charts/Chart.yaml index 53aff5b61..983fd784b 100644 --- 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.10.0 +version: 0.10.1 dependencies: - name: thanos repository: https://thanos-community.github.io/helm-charts/ diff --git a/thanos/charts/templates/query/ingress-grpc.yaml b/thanos/charts/templates/query/ingress-grpc.yaml index 6e7d5dfaa..bc4f8eec7 100644 --- a/thanos/charts/templates/query/ingress-grpc.yaml +++ b/thanos/charts/templates/query/ingress-grpc.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} name: {{ include "release.name" . }}-grpc spec: - ingressClassName: nginx + ingressClassName: {{ .Values.thanos.query.ingress.ingressClassName | default nginx }} rules: {{- range .Values.thanos.query.ingress.grpc.hosts }} - host: {{ .host | quote }} diff --git a/thanos/charts/templates/query/ingress.yaml b/thanos/charts/templates/query/ingress.yaml index e5d7c63ab..759912e7e 100644 --- a/thanos/charts/templates/query/ingress.yaml +++ b/thanos/charts/templates/query/ingress.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} name: {{ include "release.name" . }} spec: - ingressClassName: nginx + ingressClassName: {{ .Values.thanos.query.ingress.ingressClassName | default nginx }} rules: {{- range .Values.thanos.query.ingress.hosts }} - host: {{ .host | quote }} diff --git a/thanos/charts/values.yaml b/thanos/charts/values.yaml index 43259e8fd..bfff7b820 100644 --- a/thanos/charts/values.yaml +++ b/thanos/charts/values.yaml @@ -144,8 +144,7 @@ thanos: # -- IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) # This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . # ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ - # - ingressClassName: "" + ingressClassName: nginx # -- 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 From e321e19c56b9ed9c8cd514cca68ee6a4b7268556 Mon Sep 17 00:00:00 2001 From: trouaux Date: Fri, 5 Jun 2026 13:10:40 +0200 Subject: [PATCH 2/3] bump Signed-off-by: trouaux --- thanos/plugindefinition.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thanos/plugindefinition.yaml b/thanos/plugindefinition.yaml index d4465e561..727f82c13 100644 --- a/thanos/plugindefinition.yaml +++ b/thanos/plugindefinition.yaml @@ -6,12 +6,12 @@ kind: PluginDefinition metadata: name: thanos spec: - version: 0.10.0 + version: 0.10.1 description: thanos helmChart: name: thanos repository: "oci://ghcr.io/cloudoperators/greenhouse-extensions/charts" - version: 0.10.0 + version: 0.10.1 options: - default: null description: CLI param for Thanos Query From facd66982b343b411234276d69e06bac7fda2dc7 Mon Sep 17 00:00:00 2001 From: trouaux Date: Fri, 5 Jun 2026 13:12:06 +0200 Subject: [PATCH 3/3] nits Signed-off-by: trouaux --- thanos/README.md | 2 +- thanos/charts/templates/query/ingress-grpc.yaml | 2 +- thanos/charts/templates/query/ingress.yaml | 2 +- thanos/charts/values.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thanos/README.md b/thanos/README.md index 13636929d..f77da460e 100644 --- a/thanos/README.md +++ b/thanos/README.md @@ -374,7 +374,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de | thanos.query.ingress.grpc.annotations | object | `{}` | Additional annotations for the Ingress resource.(GRPC) 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/master/docs/user-guide/nginx-configuration/annotations.md | | thanos.query.ingress.grpc.enabled | bool | `false` | Enable ingress controller resource.(GRPC) | | thanos.query.ingress.grpc.hosts | list | `[{"host":"thanos.local","paths":[{"path":"/","pathType":"Prefix"}]}]` | Default host for the ingress resource.(GRPC) | -| thanos.query.ingress.grpc.ingressClassName | string | `""` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)(GRPC) This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ | +| thanos.query.ingress.grpc.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)(GRPC) This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ | | thanos.query.ingress.grpc.tls | list | `[]` | Ingress TLS configuration. (GRPC) | | thanos.query.ingress.hosts | list | `[{"host":"thanos.local","paths":[{"path":"/","pathType":"Prefix","portName":"http"}]}]` | Default host for the ingress resource | | thanos.query.ingress.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ | diff --git a/thanos/charts/templates/query/ingress-grpc.yaml b/thanos/charts/templates/query/ingress-grpc.yaml index bc4f8eec7..75102074b 100644 --- a/thanos/charts/templates/query/ingress-grpc.yaml +++ b/thanos/charts/templates/query/ingress-grpc.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} name: {{ include "release.name" . }}-grpc spec: - ingressClassName: {{ .Values.thanos.query.ingress.ingressClassName | default nginx }} + ingressClassName: {{ .Values.thanos.query.ingress.grpc.ingressClassName | default "nginx" }} rules: {{- range .Values.thanos.query.ingress.grpc.hosts }} - host: {{ .host | quote }} diff --git a/thanos/charts/templates/query/ingress.yaml b/thanos/charts/templates/query/ingress.yaml index 759912e7e..706ec9de5 100644 --- a/thanos/charts/templates/query/ingress.yaml +++ b/thanos/charts/templates/query/ingress.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} name: {{ include "release.name" . }} spec: - ingressClassName: {{ .Values.thanos.query.ingress.ingressClassName | default nginx }} + ingressClassName: {{ .Values.thanos.query.ingress.ingressClassName | default "nginx" }} rules: {{- range .Values.thanos.query.ingress.hosts }} - host: {{ .host | quote }} diff --git a/thanos/charts/values.yaml b/thanos/charts/values.yaml index bfff7b820..50c5adb27 100644 --- a/thanos/charts/values.yaml +++ b/thanos/charts/values.yaml @@ -171,7 +171,7 @@ thanos: # This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . # ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ # - ingressClassName: "" + ingressClassName: nginx # -- Additional annotations for the Ingress resource.(GRPC) To enable certificate autogeneration, place here your cert-manager annotations. # For a full list of possible ingress annotations, please see