Skip to content

Commit 5b1a3d3

Browse files
EamonZhangEamonZhang
committed
chore(mysql): Optimize the database and improve system parameters
1 parent 01a7513 commit 5b1a3d3

14 files changed

Lines changed: 7 additions & 432 deletions

File tree

‎addons/mysql-basic/8.4/chart/mysql-basic-8.4/templates/networkpolicy.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,14 @@ spec:
3535
matchLabels:
3636
kubernetes.io/metadata.name: {{ .Release.Namespace }}
3737
{{- end }}
38-
<<<<<<< HEAD
3938
{{- range $namespace := .Values.networkPolicy.allowDefaultNamespaces }}
4039
{{- if $namespace }}
4140
- namespaceSelector:
4241
matchLabels:
4342
kubernetes.io/metadata.name: {{ $namespace }}
4443
{{- end }}
4544
{{- end }}
46-
=======
47-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
45+
4846
{{- range $namespace := .Values.networkPolicy.allowNamespaces }}
4947
{{- if $namespace }}
5048
- namespaceSelector:

‎addons/mysql-basic/8.4/chart/mysql-basic-8.4/values.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,16 +635,12 @@ networkPolicy:
635635
## (with the correct destination port).
636636
##
637637
allowCurrentNamespace: true
638-
<<<<<<< HEAD
638+
639639
allowDefaultNamespaces:
640640
- drycc
641641
- backup
642642
allowNamespaces: []
643-
=======
644-
allowNamespaces:
645-
- drycc
646-
- backup
647-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
643+
648644

649645
## @section Volume Permissions parameters
650646

‎addons/mysql-basic/8.4/plans/standard-16c64g400/values.yaml‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,4 @@ primary:
4040
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
4141
##
4242
persistence:
43-
<<<<<<< HEAD
4443
size: 400Gi
45-
=======
46-
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
47-
##
48-
enabled: true
49-
## @param primary.persistence.existingClaim Name of an existing `PersistentVolumeClaim` for MySQL primary replicas
50-
## NOTE: When it's set the rest of persistence parameters are ignored
51-
##
52-
existingClaim: ""
53-
## @param primary.persistence.storageClass MySQL primary persistent volume storage Class
54-
## If defined, storageClassName: <storageClass>
55-
## If set to "-", storageClassName: "", which disables dynamic provisioning
56-
## If undefined (the default) or set to null, no storageClassName spec is
57-
## set, choosing the default provisioner. (gp2 on AWS, standard on
58-
## GKE, AWS & OpenStack)
59-
##
60-
storageClass: ""
61-
## @param primary.persistence.annotations MySQL primary persistent volume claim annotations
62-
##
63-
annotations: {}
64-
## @param primary.persistence.accessModes MySQL primary persistent volume access Modes
65-
##
66-
accessModes:
67-
- ReadWriteOnce
68-
## @param primary.persistence.size MySQL primary persistent volume size
69-
##
70-
size: 400Gi
71-
## @param primary.persistence.selector Selector to match an existing Persistent Volume
72-
## selector:
73-
## matchLabels:
74-
## app: my-app
75-
##
76-
selector: {}
77-
78-
router:
79-
replicaCount: 4
80-
configuration: |-
81-
[DEFAULT]
82-
max_total_connections = 3900
83-
[routing:bootstrap_rw]
84-
max_connections= 3900
85-
resources:
86-
limits:
87-
cpu: 1600m
88-
memory: 2Gi
89-
requests:
90-
cpu: 100m
91-
memory: 1Gi
92-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45

‎addons/mysql-basic/8.4/plans/standard-2c4g20/values.yaml‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,4 @@ primary:
4040
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
4141
##
4242
persistence:
43-
<<<<<<< HEAD
44-
size: 20Gi
45-
=======
46-
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
47-
##
48-
enabled: true
49-
## @param primary.persistence.existingClaim Name of an existing `PersistentVolumeClaim` for MySQL primary replicas
50-
## NOTE: When it's set the rest of persistence parameters are ignored
51-
##
52-
existingClaim: ""
53-
## @param primary.persistence.storageClass MySQL primary persistent volume storage Class
54-
## If defined, storageClassName: <storageClass>
55-
## If set to "-", storageClassName: "", which disables dynamic provisioning
56-
## If undefined (the default) or set to null, no storageClassName spec is
57-
## set, choosing the default provisioner. (gp2 on AWS, standard on
58-
## GKE, AWS & OpenStack)
59-
##
60-
storageClass: ""
61-
## @param primary.persistence.annotations MySQL primary persistent volume claim annotations
62-
##
63-
annotations: {}
64-
## @param primary.persistence.accessModes MySQL primary persistent volume access Modes
65-
##
66-
accessModes:
67-
- ReadWriteOnce
68-
## @param primary.persistence.size MySQL primary persistent volume size
69-
##
70-
size: 20Gi
71-
## @param primary.persistence.selector Selector to match an existing Persistent Volume
72-
## selector:
73-
## matchLabels:
74-
## app: my-app
75-
##
76-
selector: {}
77-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
43+
size: 20Gi

‎addons/mysql-basic/8.4/plans/standard-2c8g50/values.yaml‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,5 @@ primary:
4040
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
4141
##
4242
persistence:
43-
<<<<<<< HEAD
44-
45-
size: 50Gi
46-
=======
47-
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
48-
##
49-
enabled: true
50-
## @param primary.persistence.existingClaim Name of an existing `PersistentVolumeClaim` for MySQL primary replicas
51-
## NOTE: When it's set the rest of persistence parameters are ignored
52-
##
53-
existingClaim: ""
54-
## @param primary.persistence.storageClass MySQL primary persistent volume storage Class
55-
## If defined, storageClassName: <storageClass>
56-
## If set to "-", storageClassName: "", which disables dynamic provisioning
57-
## If undefined (the default) or set to null, no storageClassName spec is
58-
## set, choosing the default provisioner. (gp2 on AWS, standard on
59-
## GKE, AWS & OpenStack)
60-
##
61-
storageClass: ""
62-
## @param primary.persistence.annotations MySQL primary persistent volume claim annotations
63-
##
64-
annotations: {}
65-
## @param primary.persistence.accessModes MySQL primary persistent volume access Modes
66-
##
67-
accessModes:
68-
- ReadWriteOnce
69-
## @param primary.persistence.size MySQL primary persistent volume size
70-
##
7143
size: 50Gi
72-
## @param primary.persistence.selector Selector to match an existing Persistent Volume
73-
## selector:
74-
## matchLabels:
75-
## app: my-app
76-
##
77-
selector: {}
78-
router:
79-
replicaCount: 2
80-
configuration: |-
81-
[DEFAULT]
82-
max_total_connections = 900
83-
[routing:bootstrap_rw]
84-
max_connections= 900
85-
resources:
86-
limits:
87-
cpu: 500m
88-
memory: 512Mi
89-
requests:
90-
cpu: 100m
91-
memory: 512Mi
92-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
44+

‎addons/mysql-basic/8.4/plans/standard-32c128g800/values.yaml‎

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -40,52 +40,5 @@ primary:
4040
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
4141
##
4242
persistence:
43-
<<<<<<< HEAD
4443
size: 800Gi
45-
=======
46-
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
47-
##
48-
enabled: true
49-
## @param primary.persistence.existingClaim Name of an existing `PersistentVolumeClaim` for MySQL primary replicas
50-
## NOTE: When it's set the rest of persistence parameters are ignored
51-
##
52-
existingClaim: ""
53-
## @param primary.persistence.storageClass MySQL primary persistent volume storage Class
54-
## If defined, storageClassName: <storageClass>
55-
## If set to "-", storageClassName: "", which disables dynamic provisioning
56-
## If undefined (the default) or set to null, no storageClassName spec is
57-
## set, choosing the default provisioner. (gp2 on AWS, standard on
58-
## GKE, AWS & OpenStack)
59-
##
60-
storageClass: ""
61-
## @param primary.persistence.annotations MySQL primary persistent volume claim annotations
62-
##
63-
annotations: {}
64-
## @param primary.persistence.accessModes MySQL primary persistent volume access Modes
65-
##
66-
accessModes:
67-
- ReadWriteOnce
68-
## @param primary.persistence.size MySQL primary persistent volume size
69-
##
70-
size: 800Gi
71-
## @param primary.persistence.selector Selector to match an existing Persistent Volume
72-
## selector:
73-
## matchLabels:
74-
## app: my-app
75-
##
76-
selector: {}
77-
router:
78-
replicaCount: 4
79-
configuration: |-
80-
[DEFAULT]
81-
max_total_connections = 7900
82-
[routing:bootstrap_rw]
83-
max_connections= 7900
84-
resources:
85-
limits:
86-
cpu: 3200m
87-
memory: 4Gi
88-
requests:
89-
cpu: 100m
90-
memory: 1Gi
91-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
44+

‎addons/mysql-basic/8.4/plans/standard-4c16g100/values.yaml‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -41,53 +41,4 @@ primary:
4141
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
4242
##
4343
persistence:
44-
<<<<<<< HEAD
4544
size: 100Gi
46-
=======
47-
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
48-
##
49-
enabled: true
50-
## @param primary.persistence.existingClaim Name of an existing `PersistentVolumeClaim` for MySQL primary replicas
51-
## NOTE: When it's set the rest of persistence parameters are ignored
52-
##
53-
existingClaim: ""
54-
## @param primary.persistence.storageClass MySQL primary persistent volume storage Class
55-
## If defined, storageClassName: <storageClass>
56-
## If set to "-", storageClassName: "", which disables dynamic provisioning
57-
## If undefined (the default) or set to null, no storageClassName spec is
58-
## set, choosing the default provisioner. (gp2 on AWS, standard on
59-
## GKE, AWS & OpenStack)
60-
##
61-
storageClass: ""
62-
## @param primary.persistence.annotations MySQL primary persistent volume claim annotations
63-
##
64-
annotations: {}
65-
## @param primary.persistence.accessModes MySQL primary persistent volume access Modes
66-
##
67-
accessModes:
68-
- ReadWriteOnce
69-
## @param primary.persistence.size MySQL primary persistent volume size
70-
##
71-
size: 100Gi
72-
## @param primary.persistence.selector Selector to match an existing Persistent Volume
73-
## selector:
74-
## matchLabels:
75-
## app: my-app
76-
##
77-
selector: {}
78-
79-
router:
80-
replicaCount: 3
81-
configuration: |-
82-
[DEFAULT]
83-
max_total_connections = 1200
84-
[routing:bootstrap_rw]
85-
max_connections= 1200
86-
resources:
87-
limits:
88-
cpu: 500m
89-
memory: 512Mi
90-
requests:
91-
cpu: 500m
92-
memory: 512Mi
93-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45

‎addons/mysql-basic/8.4/plans/standard-8c32g200/values.yaml‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,5 @@ primary:
4040
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
4141
##
4242
persistence:
43-
<<<<<<< HEAD
4443
size: 200Gi
45-
=======
46-
## @param primary.persistence.enabled Enable persistence on MySQL primary replicas using a `PersistentVolumeClaim`. If false, use emptyDir
47-
##
48-
enabled: true
49-
## @param primary.persistence.existingClaim Name of an existing `PersistentVolumeClaim` for MySQL primary replicas
50-
## NOTE: When it's set the rest of persistence parameters are ignored
51-
##
52-
existingClaim: ""
53-
## @param primary.persistence.storageClass MySQL primary persistent volume storage Class
54-
## If defined, storageClassName: <storageClass>
55-
## If set to "-", storageClassName: "", which disables dynamic provisioning
56-
## If undefined (the default) or set to null, no storageClassName spec is
57-
## set, choosing the default provisioner. (gp2 on AWS, standard on
58-
## GKE, AWS & OpenStack)
59-
##
60-
storageClass: ""
61-
## @param primary.persistence.annotations MySQL primary persistent volume claim annotations
62-
##
63-
annotations: {}
64-
## @param primary.persistence.accessModes MySQL primary persistent volume access Modes
65-
##
66-
accessModes:
67-
- ReadWriteOnce
68-
## @param primary.persistence.size MySQL primary persistent volume size
69-
##
70-
size: 200Gi
71-
## @param primary.persistence.selector Selector to match an existing Persistent Volume
72-
## selector:
73-
## matchLabels:
74-
## app: my-app
75-
##
76-
selector: {}
7744

78-
router:
79-
replicaCount: 4
80-
configuration: |-
81-
[DEFAULT]
82-
max_total_connections = 1900
83-
[routing:bootstrap_rw]
84-
max_connections= 1900
85-
resources:
86-
limits:
87-
cpu: 800m
88-
memory: 1024Mi
89-
requests:
90-
cpu: 100m
91-
memory: 1Gi
92-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45

‎addons/mysql-cluster/8.4/chart/mysql-cluster-8.4/templates/networkpolicy.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,13 @@ spec:
4040
matchLabels:
4141
kubernetes.io/metadata.name: {{ .Release.Namespace }}
4242
{{- end }}
43-
<<<<<<< HEAD
4443
{{- range $namespace := .Values.networkPolicy.allowDefaultNamespaces }}
4544
{{- if $namespace }}
4645
- namespaceSelector:
4746
matchLabels:
4847
kubernetes.io/metadata.name: {{ $namespace }}
4948
{{- end }}
5049
{{- end }}
51-
=======
52-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
5350
{{- range $namespace := .Values.networkPolicy.allowNamespaces }}
5451
{{- if $namespace }}
5552
- namespaceSelector:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -995,12 +995,10 @@ networkPolicy:
995995
## (with the correct destination port).
996996
##
997997
allowCurrentNamespace: true
998-
<<<<<<< HEAD
999998
allowDefaultNamespaces:
1000999
- drycc
10011000
- backup
1002-
=======
1003-
>>>>>>> 717aa138fc9c36b785b1544ef4f043d6c77f6d45
1001+
10041002
allowNamespaces: []
10051003

10061004
## @section Volume Permissions parameters

0 commit comments

Comments
 (0)