Skip to content

Commit d00010f

Browse files
EamonZhangEamonZhang
committed
chore(mysql-cluster): set persistentVolumeClaimRetentionPolicy deleted
1 parent b573f91 commit d00010f

10 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎addons/mysql-cluster/8.0/chart/mysql-cluster/templates/primary/statefulset.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,11 @@ spec:
369369
- name: data
370370
emptyDir: {}
371371
{{- else if and .Values.primary.persistence.enabled (not .Values.primary.persistence.existingClaim) }}
372+
{{- if .Values.primary.persistentVolumeClaimRetentionPolicy.enabled }}
373+
persistentVolumeClaimRetentionPolicy:
374+
whenDeleted: {{ .Values.primary.persistentVolumeClaimRetentionPolicy.whenDeleted }}
375+
whenScaled: {{ .Values.primary.persistentVolumeClaimRetentionPolicy.whenScaled }}
376+
{{- end }}
372377
volumeClaimTemplates:
373378
- metadata:
374379
name: data

‎addons/mysql-cluster/8.0/chart/mysql-cluster/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,10 @@ primary:
474474
## Enable persistence using Persistent Volume Claims
475475
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
476476
##
477+
persistentVolumeClaimRetentionPolicy:
478+
enabled: true
479+
whenScaled: Delete
480+
whenDeleted: Delete
477481
persistence:
478482
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
479483
##

‎addons/mysql-cluster/8.0/plans/standard-10/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

‎addons/mysql-cluster/8.0/plans/standard-10/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ primary:
1616
resources:
1717
limits:
1818
cpu: 1000m
19-
memory: 2048Mi
19+
memory: 4Gi
2020
requests:
2121
cpu: 1000m
22-
memory: 2048Mi
23-
22+
memory: 4Gi
23+
2424

2525
## @section Persistence parameters
2626

‎addons/mysql-cluster/8.0/plans/standard-100/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

‎addons/mysql-cluster/8.0/plans/standard-20/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

‎addons/mysql-cluster/8.0/plans/standard-200/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

‎addons/mysql-cluster/8.0/plans/standard-400/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

‎addons/mysql-cluster/8.0/plans/standard-50/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

‎addons/mysql-cluster/8.0/plans/standard-800/bind.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
credential:
22
{{- if (eq .Values.router.service.type "LoadBalancer") }}
3-
- name: HOST
3+
- name: EXTRANET_HOST
44
valueFrom:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8-
{{- else if (eq .Values.router.service.type "ClusterIP") }}
8+
{{- end }}
99
- name: HOST
1010
valueFrom:
1111
serviceRef:
1212
name: {{ include "common.names.fullname" . }}-router
1313
jsonpath: '{ .spec.clusterIP }'
14-
{{- end }}
1514
- name: PASSWORD
1615
valueFrom:
1716
secretKeyRef:

0 commit comments

Comments
 (0)