Skip to content

Commit 4232306

Browse files
TomHelliermigruiz4bitnami-bot
authored
[bitnami/thanos] addition of parameter to configure statefulset annotations (#33988)
* [bitnami/thanos] addition of parameter to configure statefulset annotations applied to thanos receive/storegateway/ruler Also fixes bug introduced in #34825 Signed-off-by: Tom Hellier <[email protected]> * Bump minor version Signed-off-by: Miguel Ruiz <[email protected]> Signed-off-by: Miguel Ruiz <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Bot <[email protected]> --------- Signed-off-by: Tom Hellier <[email protected]> Signed-off-by: Miguel Ruiz <[email protected]> Signed-off-by: Bitnami Bot <[email protected]> Co-authored-by: Miguel Ruiz <[email protected]> Co-authored-by: Bitnami Bot <[email protected]>
1 parent 602ab75 commit 4232306

File tree

9 files changed

+77
-15
lines changed

9 files changed

+77
-15
lines changed

‎bitnami/thanos/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# Changelog
22

3+
## 17.2.0 (2025-07-09)
4+
5+
* [bitnami/thanos] addition of parameter to configure statefulset annotations ([#33988](https://github.com/bitnami/charts/pull/33988))
6+
37
## 17.1.0 (2025-07-09)
48

5-
* [bitnami/thanos] feat: Added support for configuring dual-stack for services ([#34825](https://github.com/bitnami/charts/pull/34825))
9+
* [bitnami/thanos] feat: Added support for configuring dual-stack for services (#34825) ([ee5ebdd](https://github.com/bitnami/charts/commit/ee5ebddd317f9b1bb39f4b6c3da9297713b2b156)), closes [#34825](https://github.com/bitnami/charts/issues/34825)
610

711
## <small>17.0.7 (2025-07-09)</small>
812

‎bitnami/thanos/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ maintainers:
3838
name: thanos
3939
sources:
4040
- https://github.com/bitnami/charts/tree/main/bitnami/thanos
41-
version: 17.1.0
41+
version: 17.2.0

‎bitnami/thanos/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,8 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru
10661066
| `storegateway.tolerations` | Thanos Store Gateway tolerations for pod assignment | `[]` |
10671067
| `storegateway.podLabels` | Thanos Store Gateway pod labels | `{}` |
10681068
| `storegateway.podAnnotations` | Annotations for Thanos Store Gateway pods | `{}` |
1069+
| `storegateway.statefulsetLabels` | Thanos Store Gateway statefulset labels | `{}` |
1070+
| `storegateway.statefulsetAnnotations` | Thanos Store Gateway statefulset annotations | `{}` |
10691071
| `storegateway.dnsConfig` | Deployment pod DNS config | `{}` |
10701072
| `storegateway.dnsPolicy` | Deployment pod DNS policy | `""` |
10711073
| `storegateway.hostAliases` | Deployment pod host aliases | `[]` |
@@ -1239,6 +1241,8 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru
12391241
| `ruler.tolerations` | Thanos Ruler tolerations for pod assignment | `[]` |
12401242
| `ruler.podLabels` | Thanos Ruler pod labels | `{}` |
12411243
| `ruler.podAnnotations` | Annotations for Thanos Ruler pods | `{}` |
1244+
| `ruler.statefulsetLabels` | Thanos Ruler statefulset labels | `{}` |
1245+
| `ruler.statefulsetAnnotations` | Thanos Ruler statefulset annotations | `{}` |
12421246
| `ruler.dnsConfig` | Deployment pod DNS config | `{}` |
12431247
| `ruler.dnsPolicy` | Deployment pod DNS policy | `""` |
12441248
| `ruler.hostAliases` | Deployment pod host aliases | `[]` |
@@ -1395,6 +1399,7 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru
13951399
| `receive.nodeSelector` | Thanos Receive node labels for pod assignment | `{}` |
13961400
| `receive.tolerations` | Thanos Receive tolerations for pod assignment | `[]` |
13971401
| `receive.statefulsetLabels` | Thanos Receive statefulset labels | `{}` |
1402+
| `receive.statefulsetAnnotations` | Thanos Receive statefulset annotations | `{}` |
13981403
| `receive.podLabels` | Thanos Receive pod labels | `{}` |
13991404
| `receive.podAnnotations` | Annotations for Thanos Receive pods | `{}` |
14001405
| `receive.dnsConfig` | Deployment pod DNS config | `{}` |

‎bitnami/thanos/templates/receive/statefulset.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ metadata:
1414
{{- if .Values.receive.statefulsetLabels }}
1515
{{- include "common.tplvalues.render" ( dict "value" .Values.receive.statefulsetLabels "context" $ ) | nindent 4 }}
1616
{{- end }}
17-
{{- if .Values.commonAnnotations }}
18-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
17+
{{- if or .Values.commonAnnotations .Values.receive.statefulsetAnnotations }}
18+
annotations:
19+
{{- if .Values.commonAnnotations }}
20+
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
21+
{{- end }}
22+
{{- if .Values.receive.statefulsetAnnotations }}
23+
{{- include "common.tplvalues.render" (dict "value" .Values.receive.statefulsetAnnotations "context" $) | nindent 4 }}
24+
{{- end }}
1925
{{- end }}
2026
spec:
2127
{{- if not (or .Values.receive.autoscaling.enabled .Values.receive.externalAutoscaler) }}

‎bitnami/thanos/templates/ruler/statefulset.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@ metadata:
1111
namespace: {{ include "common.names.namespace" . }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/component: ruler
14-
{{- if .Values.commonAnnotations }}
15-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
14+
{{- if .Values.ruler.statefulsetLabels }}
15+
{{- include "common.tplvalues.render" ( dict "value" .Values.ruler.statefulsetLabels "context" $ ) | nindent 4 }}
16+
{{- end }}
17+
{{- if or .Values.commonAnnotations .Values.ruler.statefulsetAnnotations }}
18+
annotations:
19+
{{- if .Values.commonAnnotations }}
20+
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
21+
{{- end }}
22+
{{- if .Values.ruler.statefulsetAnnotations }}
23+
{{- include "common.tplvalues.render" (dict "value" .Values.ruler.statefulsetAnnotations "context" $) | nindent 4 }}
24+
{{- end }}
1625
{{- end }}
1726
spec:
1827
{{- if not (or .Values.ruler.autoscaling.enabled .Values.ruler.externalAutoscaler) }}

‎bitnami/thanos/templates/storegateway/service-sharded.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ spec:
4747
{{- if and (eq $.Values.storegateway.service.type "LoadBalancer") $.Values.storegateway.service.loadBalancerSourceRanges }}
4848
loadBalancerSourceRanges: {{- toYaml $.Values.storegateway.service.loadBalancerSourceRanges | nindent 4 }}
4949
{{- end }}
50-
{{- if .Values.storegateway.service.ipFamilyPolicy }}
51-
ipFamilyPolicy: {{ .Values.storegateway.service.ipFamilyPolicy }}
50+
{{- if $.Values.storegateway.service.ipFamilyPolicy }}
51+
ipFamilyPolicy: {{ $.Values.storegateway.service.ipFamilyPolicy }}
5252
{{- end }}
53-
{{- if .Values.storegateway.service.ipFamilies }}
54-
ipFamilies: {{ toYaml .Values.storegateway.service.ipFamilies | nindent 4 }}
53+
{{- if $.Values.storegateway.service.ipFamilies }}
54+
ipFamilies: {{ toYaml $.Values.storegateway.service.ipFamilies | nindent 4 }}
5555
{{- end }}
5656
ports:
5757
- port: {{ $.Values.storegateway.service.ports.http }}

‎bitnami/thanos/templates/storegateway/statefulset-sharded.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,20 @@ kind: StatefulSet
2828
metadata:
2929
name: {{ printf "%s-%s" (include "thanos.storegateway.fullname" $) (toString $index) | trunc 63 | trimSuffix "-" }}
3030
namespace: {{ include "common.names.namespace" $ }}
31-
labels: {{- include "common.labels.standard" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
31+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
3232
app.kubernetes.io/component: storegateway
3333
shard: {{ $index | quote }}
34-
{{- if $.Values.commonAnnotations }}
35-
annotations: {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }}
34+
{{- if $.Values.storegateway.statefulsetLabels }}
35+
{{- include "common.tplvalues.render" ( dict "value" $.Values.storegateway.statefulsetLabels "context" $ ) | nindent 4 }}
36+
{{- end }}
37+
{{- if or $.Values.commonAnnotations $.Values.storegateway.statefulsetAnnotations }}
38+
annotations:
39+
{{- if $.Values.commonAnnotations }}
40+
{{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }}
41+
{{- end }}
42+
{{- if $.Values.storegateway.statefulsetAnnotations }}
43+
{{- include "common.tplvalues.render" (dict "value" $.Values.storegateway.statefulsetAnnotations "context" $) | nindent 4 }}
44+
{{- end }}
3645
{{- end }}
3746
spec:
3847
{{- if not $.Values.storegateway.autoscaling.enabled }}

‎bitnami/thanos/templates/storegateway/statefulset.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@ metadata:
1111
namespace: {{ include "common.names.namespace" . }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/component: storegateway
14-
{{- if .Values.commonAnnotations }}
15-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
14+
{{- if .Values.storegateway.statefulsetLabels }}
15+
{{- include "common.tplvalues.render" ( dict "value" .Values.storegateway.statefulsetLabels "context" $ ) | nindent 4 }}
16+
{{- end }}
17+
{{- if or .Values.commonAnnotations .Values.storegateway.statefulsetAnnotations }}
18+
annotations:
19+
{{- if .Values.commonAnnotations }}
20+
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
21+
{{- end }}
22+
{{- if .Values.storegateway.statefulsetAnnotations }}
23+
{{- include "common.tplvalues.render" (dict "value" .Values.storegateway.statefulsetAnnotations "context" $) | nindent 4 }}
24+
{{- end }}
1625
{{- end }}
1726
spec:
1827
{{- if not (or .Values.storegateway.autoscaling.enabled .Values.storegateway.externalAutoscaler) }}

‎bitnami/thanos/values.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2872,6 +2872,14 @@ storegateway:
28722872
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
28732873
##
28742874
podAnnotations: {}
2875+
## @param storegateway.statefulsetLabels Thanos Store Gateway statefulset labels
2876+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
2877+
##
2878+
statefulsetLabels: {}
2879+
## @param storegateway.statefulsetAnnotations Thanos Store Gateway statefulset annotations
2880+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
2881+
##
2882+
statefulsetAnnotations: {}
28752883
## @param storegateway.dnsConfig Deployment pod DNS config
28762884
## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
28772885
## E.g.
@@ -3644,6 +3652,14 @@ ruler:
36443652
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
36453653
##
36463654
podAnnotations: {}
3655+
## @param ruler.statefulsetLabels Thanos Ruler statefulset labels
3656+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
3657+
##
3658+
statefulsetLabels: {}
3659+
## @param ruler.statefulsetAnnotations Thanos Ruler statefulset annotations
3660+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
3661+
##
3662+
statefulsetAnnotations: {}
36473663
## @param ruler.dnsConfig Deployment pod DNS config
36483664
## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
36493665
## E.g.
@@ -4277,6 +4293,10 @@ receive:
42774293
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
42784294
##
42794295
statefulsetLabels: {}
4296+
## @param receive.statefulsetAnnotations Thanos Receive statefulset annotations
4297+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
4298+
##
4299+
statefulsetAnnotations: {}
42804300
## @param receive.podLabels Thanos Receive pod labels
42814301
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
42824302
##

0 commit comments

Comments
 (0)