Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[kube-prometheus-stack] introduce PVC claim retention field in prometheus operator #4570

Merged
merged 9 commits into from
May 31, 2024
Merged

[kube-prometheus-stack] introduce PVC claim retention field in prometheus operator #4570

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b528b4
introduce persistentVolumeClaimRetentionPolicy field in Prometheus op…
Woojciech May 27, 2024
953e1c5
add newline at the end of helpers, as per convention
Woojciech May 27, 2024
7d94711
fix semver
Woojciech May 27, 2024
ec20441
improve code as per PR suggestions
Woojciech May 28, 2024
e304130
Merge branch 'main' into kube-prometheus-stack-pvc-claim-retention
Woojciech May 28, 2024
9da6d5b
add empty value as default to values.yaml
Woojciech May 28, 2024
cf33303
remove trailing spaces
Woojciech May 29, 2024
0f0c837
Merge branch 'main' into kube-prometheus-stack-pvc-claim-retention
Woojciech May 31, 2024
ac71f7f
remove trailing spaces
Woojciech May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 58.7.2
version: 58.8.2
appVersion: v0.73.2
kubeVersion: ">=1.19.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
Expand Down
4 changes: 4 additions & 0 deletions charts/kube-prometheus-stack/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,3 +318,7 @@ global:
{{ $fullname }}-webhook.{{ $namespace }}.svc
{{- end }}
{{- end }}

{{- define "kube-prometheus-stack.operator.kubeVersion" -}}
{{- default .Capabilities.KubeVersion.Version (regexFind "v[0-9]+\\.[0-9]+\\.[0-9]+" .Capabilities.KubeVersion.Version) -}}
{{- end -}}
5 changes: 5 additions & 0 deletions charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ spec:
storage:
{{ tpl (toYaml .Values.prometheus.prometheusSpec.storageSpec | indent 4) . }}
{{- end }}
{{- if semverCompare ">= 1.27.0" (include "kube-prometheus-stack.operator.kubeVersion" .) }}
persistentVolumeClaimRetentionPolicy:
whenDeleted: {{ ternary "Delete" "Retain" .Values.prometheusOperator.statefulSet.pvcDeleteOnStsDelete }}
whenScaled: {{ ternary "Delete" "Retain" .Values.prometheusOperator.statefulSet.pvcDeleteOnStsScale }}
{{- end }}
jkroepke marked this conversation as resolved.
Show resolved Hide resolved
{{- if .Values.prometheus.prometheusSpec.podMetadata }}
podMetadata:
{{ tpl (toYaml .Values.prometheus.prometheusSpec.podMetadata | indent 4) . }}
Expand Down
9 changes: 9 additions & 0 deletions charts/kube-prometheus-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2884,6 +2884,15 @@ prometheusOperator:
##
automountServiceAccountToken: true

## Statefulset's persistent volume claim retention policy
## pvcDeleteOnStsDelete and pvcDeleteOnStsScale determine whether
## statefulset's PVCs are deleted (true) or retained (false) on scaling down
## and deleting statefulset, respectively. Requires 1.27.0+.
## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
statefulSet:
pvcDeleteOnStsDelete: false
pvcDeleteOnStsScale: false

## Additional volumes
##
extraVolumes: []
Expand Down