Skip to content

Commit 781ba2c

Browse files
jianxiaoguojianxiaoguo
committed
chore(addons): add persistentVolumeClaimRetentionPolicy
1 parent 5438e39 commit 781ba2c

20 files changed

Lines changed: 181 additions & 1 deletion

File tree

‎addons/minio/2023/chart/minio/templates/distributed/statefulset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,11 @@ spec:
298298
- name: data
299299
emptyDir: {}
300300
{{- else }}
301+
{{- if .Values.persistentVolumeClaimRetentionPolicy.enabled }}
302+
persistentVolumeClaimRetentionPolicy:
303+
whenDeleted: {{ .Values.persistentVolumeClaimRetentionPolicy.whenDeleted }}
304+
whenScaled: {{ .Values.persistentVolumeClaimRetentionPolicy.whenScaled }}
305+
{{- end }}
301306
volumeClaimTemplates:
302307
{{- if gt $drivesPerNode 1 }}
303308
{{- range $diskId := until $drivesPerNode }}

‎addons/minio/2023/chart/minio/values.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,15 @@ persistence:
887887
##
888888
existingClaim: ""
889889

890+
## persistentVolumeClaimRetentionPolicy
891+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
892+
## @param persistentVolumeClaimRetentionPolicy.enabled Controls if and how PVCs are deleted during the lifecycle of a StatefulSet
893+
## @param persistentVolumeClaimRetentionPolicy.whenScaled Volume retention behavior when the replica count of the StatefulSet is reduced
894+
## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
895+
persistentVolumeClaimRetentionPolicy:
896+
enabled: true
897+
whenScaled: Deleted
898+
whenDeleted: Deleted
890899
## @section Volume Permissions parameters
891900

892901
## Init containers parameters:

‎addons/opensearch/2.10/chart/opensearch/templates/data/statefulset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,11 @@ spec:
327327
persistentVolumeClaim:
328328
claimName: {{ .Values.data.persistence.existingClaim }}
329329
{{- else }}
330+
{{- if .Values.data.persistentVolumeClaimRetentionPolicy.enabled }}
331+
persistentVolumeClaimRetentionPolicy:
332+
whenDeleted: {{ .Values.data.persistentVolumeClaimRetentionPolicy.whenDeleted }}
333+
whenScaled: {{ .Values.data.persistentVolumeClaimRetentionPolicy.whenScaled }}
334+
{{- end }}
330335
volumeClaimTemplates:
331336
- metadata:
332337
name: "data"

‎addons/opensearch/2.10/chart/opensearch/templates/master/statefulset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,11 @@ spec:
339339
persistentVolumeClaim:
340340
claimName: {{ .Values.master.persistence.existingClaim }}
341341
{{- else }}
342+
{{- if .Values.master.persistentVolumeClaimRetentionPolicy.enabled }}
343+
persistentVolumeClaimRetentionPolicy:
344+
whenDeleted: {{ .Values.master.persistentVolumeClaimRetentionPolicy.whenDeleted }}
345+
whenScaled: {{ .Values.master.persistentVolumeClaimRetentionPolicy.whenScaled }}
346+
{{- end }}
342347
volumeClaimTemplates:
343348
- metadata:
344349
name: "data"

‎addons/opensearch/2.10/chart/opensearch/values.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,16 @@ master:
766766
## @param master.persistence.size Persistent Volume Size
767767
##
768768
size: 8Gi
769+
## persistentVolumeClaimRetentionPolicy
770+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
771+
## @param master.persistentVolumeClaimRetentionPolicy.enabled Controls if and how PVCs are deleted during the lifecycle of a StatefulSet
772+
## @param master.persistentVolumeClaimRetentionPolicy.whenScaled Volume retention behavior when the replica count of the StatefulSet is reduced
773+
## @param master.persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
774+
##
775+
persistentVolumeClaimRetentionPolicy:
776+
enabled: true
777+
whenScaled: Delete
778+
whenDeleted: Delete
769779
## Pods Service Account
770780
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
771781
## @param master.serviceAccount.create Specifies whether a ServiceAccount should be created
@@ -1162,6 +1172,16 @@ data:
11621172
## @param data.persistence.size Persistent Volume Size
11631173
##
11641174
size: 8Gi
1175+
## persistentVolumeClaimRetentionPolicy
1176+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
1177+
## @param master.persistentVolumeClaimRetentionPolicy.enabled Controls if and how PVCs are deleted during the lifecycle of a StatefulSet
1178+
## @param master.persistentVolumeClaimRetentionPolicy.whenScaled Volume retention behavior when the replica count of the StatefulSet is reduced
1179+
## @param master.persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
1180+
##
1181+
persistentVolumeClaimRetentionPolicy:
1182+
enabled: true
1183+
whenScaled: Delete
1184+
whenDeleted: Delete
11651185
## Pods Service Account
11661186
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
11671187
## @param data.serviceAccount.create Specifies whether a ServiceAccount should be created

‎addons/rabbitmq/3.12/chart/rabbitmq/templates/statefulset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,11 @@ spec:
406406
claimName: {{ tpl . $ }}
407407
{{- end }}
408408
{{- else }}
409+
{{- if .Values.persistentVolumeClaimRetentionPolicy.enabled }}
410+
persistentVolumeClaimRetentionPolicy:
411+
whenDeleted: {{ .Values.persistentVolumeClaimRetentionPolicy.whenDeleted }}
412+
whenScaled: {{ .Values.persistentVolumeClaimRetentionPolicy.whenScaled }}
413+
{{- end }}
409414
volumeClaimTemplates:
410415
- metadata:
411416
name: data

‎addons/rabbitmq/3.12/chart/rabbitmq/values.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,19 @@ persistence:
835835
## example.io/disk-volume-type: SSD
836836
##
837837
annotations: {}
838+
## Persistent Volume Claim Retention Policy
839+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
840+
##
841+
persistentVolumeClaimRetentionPolicy:
842+
## @param persistentVolumeClaimRetentionPolicy.enabled Enable Persistent volume retention policy for rabbitmq Statefulset
843+
##
844+
enabled: true
845+
## @param persistentVolumeClaimRetentionPolicy.whenScaled Volume retention behavior when the replica count of the StatefulSet is reduced
846+
##
847+
whenScaled: Delete
848+
## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
849+
##
850+
whenDeleted: Delete
838851

839852
## @section Exposure parameters
840853
##

‎addons/redis-cluster/7.0/chart/redis-cluster/templates/redis-statefulset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,11 @@ spec:
425425
secretName: {{ include "redis-cluster.tlsSecretName" . }}
426426
defaultMode: 256
427427
{{- end }}
428+
{{- if .Values.persistentVolumeClaimRetentionPolicy.enabled }}
429+
persistentVolumeClaimRetentionPolicy:
430+
whenDeleted: {{ .Values.persistentVolumeClaimRetentionPolicy.whenDeleted }}
431+
whenScaled: {{ .Values.persistentVolumeClaimRetentionPolicy.whenScaled }}
432+
{{- end }}
428433
volumeClaimTemplates:
429434
- metadata:
430435
name: redis-data

‎addons/redis-cluster/7.0/chart/redis-cluster/values.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,15 @@ persistence:
322322
##
323323
matchExpressions: {}
324324

325+
## persistentVolumeClaimRetentionPolicy
326+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
327+
## @param persistentVolumeClaimRetentionPolicy.enabled Controls if and how PVCs are deleted during the lifecycle of a StatefulSet
328+
## @param persistentVolumeClaimRetentionPolicy.whenScaled Volume retention behavior when the replica count of the StatefulSet is reduced
329+
## @param persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
330+
persistentVolumeClaimRetentionPolicy:
331+
enabled: true
332+
whenScaled: Deleted
333+
whenDeleted: Deleted
325334
## Init containers parameters:
326335
## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
327336
##

‎addons/redis/7.0/chart/redis/templates/master/application.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,11 @@ spec:
449449
persistentVolumeClaim:
450450
claimName: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }}
451451
{{- else }}
452+
{{- if .Values.master.persistentVolumeClaimRetentionPolicy.enabled }}
453+
persistentVolumeClaimRetentionPolicy:
454+
whenDeleted: {{ .Values.master.persistentVolumeClaimRetentionPolicy.whenDeleted }}
455+
whenScaled: {{ .Values.master.persistentVolumeClaimRetentionPolicy.whenScaled }}
456+
{{- end }}
452457
volumeClaimTemplates:
453458
- metadata:
454459
name: redis-data

0 commit comments

Comments
 (0)