chore(mysql-cluster): adjust bind params

Author: EamonZhang

addons/mysql-cluster/8.0/chart/mysql-cluster/Chart.yaml

@@ -1,7 +1,7 @@
 annotations:
   category: Database
 apiVersion: v2
-appVersion: 8.0.30
+appVersion: 8.0.35
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
@@ -25,4 +25,4 @@ name: mysql
 sources:
   - https://github.com/drycc/containers/tree/main/drycc/mysql
   - https://mysql.com
-version: 9.3.5
+version: 8.0.35

addons/mysql-cluster/8.0/chart/mysql-cluster/templates/cluster/deployments.yaml

@@ -0,0 +1,41 @@
+{{- /*
+Copyright Drycc Community.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "mysql.cluster.fullname" . }}-tools
+  namespace: {{ include "common.names.namespace" . | quote }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
+      app.kubernetes.io/component: mysql-cluster-tools
+  
+  template:
+    metadata:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/component:  mysql-cluster-tools
+ 
+    spec:
+      containers:         
+        - name: cluster-tools
+          image: {{ include "cluster.image" . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          command: 
+            - /bin/bash
+            - -ec
+            - |
+              sleep infinity
+          env:
+            - name: MYSQL_MASTER_PORT_NUMBER
+              value: {{ .Values.primary.service.ports.mysql | quote }}
+            - name: MYSQL_MASTER_ROOT_USER
+              value: "root"
+            - name: MYSQL_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mysql.secretName" . }}
+                  key: mysql-root-password

addons/mysql-cluster/8.0/chart/mysql-cluster/templates/cluster/job.yaml

@@ -67,7 +67,8 @@ spec:
               " > /tmp/slave.sql 
               mysql -h${HOST_1} -P${MYSQL_MASTER_PORT_NUMBER} -uroot -p${MYSQL_ROOT_PASSWORD}  < /tmp/slave.sql
               mysql -h${HOST_2} -P${MYSQL_MASTER_PORT_NUMBER} -uroot -p${MYSQL_ROOT_PASSWORD}  < /tmp/slave.sql
-    
+              mysql -h${HOST_0} -P${MYSQL_MASTER_PORT_NUMBER} -uroot -p${MYSQL_ROOT_PASSWORD} -e "GRANT ALL PRIVILEGES ON *.* TO administrator@'%' WITH GRANT OPTION;flush privileges;"
+              
           env:
             - name: DRYCC_DEBUG
               value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }}

addons/mysql-cluster/8.0/chart/mysql-cluster/templates/secrets.yaml

@@ -46,7 +46,7 @@ metadata:
   {{- end }}
 type: servicebinding.io/mysql
 data:
-  provider: {{ print "bitnami" | b64enc | quote }}
+  provider: {{ print "drycc" | b64enc | quote }}
   type: {{ print "mysql" | b64enc | quote }}
   host: {{ print $host | b64enc | quote }}
   port: {{ print $port | b64enc | quote }}
@@ -60,7 +60,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.names.fullname" . }}-svcbind-custom-user
+  name: {{ include "common.names.fullname" . }}-svcbind-administrator-user
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}

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

@@ -113,11 +113,11 @@ auth:
   ## @param auth.database Name for a custom database to create
   ## ref: https://github.com/drycc/containers/tree/main/drycc/mysql#creating-a-database-on-first-run
   ##
-  database: "mx_database"
+  database: "mondb"
   ## @param auth.username Name for a custom user to create
   ## ref: https://github.com/drycc/containers/tree/main/drycc/mysql#creating-a-database-user-on-first-run
   ##
-  username: "mx111"
+  username: "administrator"
   ## @param auth.password Password for the new user. Ignored if existing secret is provided
   ##
   password: ""
@@ -127,7 +127,7 @@ auth:
   replicationUser: replicator
   ## @param auth.replicationPassword MySQL replication user password. Ignored if existing secret is provided
   ##
-  replicationPassword: "user4_repUU"
+  replicationPassword: ""
   ## @param auth.existingSecret Use existing secret for password details. The secret has to contain the keys `mysql-root-password`, `mysql-replication-password` and `mysql-password`
   ## NOTE: When it's set the auth.rootPassword, auth.password, auth.replicationPassword are ignored.
   ##
@@ -244,6 +244,7 @@ primary:
     disabled_storage_engines="MyISAM,BLACKHOLE,FEDERATED,ARCHIVE,MEMORY"
     sql_require_primary_key=ON
     log_error_suppression_list='MY-013360'
+    binlog_transaction_dependency_tracking=WRITESET
     # Replication
   
     log_bin=mysql-bin
@@ -603,6 +604,7 @@ cluster:
     digest: ""
     pullPolicy: IfNotPresent 
 
+
 router:
   ## @param router.name Name of the router 
   ##

addons/mysql-cluster/8.0/meta.yaml

@@ -13,12 +13,12 @@ tags: mysql-cluster
 bindable: true
 instances_retrievable: true
 bindings_retrievable: true
-plan_updateable: false
+plan_updateable: true
 allow_parameters:
 - name: "networkPolicy.allowNamespaces"
   required: false
   description: "networkPolicy allowNamespaces config for values.yaml"
 - name: "router.service.type"
   required: false
   description: "service type config for values.yaml"
-archive: false
+archive: false

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

@@ -9,31 +9,26 @@ credential:
   - name: HOST
     valueFrom:
       serviceRef:
-        name: {{ include "common.names.fullname" . }}
+        name: {{ include "common.names.fullname" . }}-router
         jsonpath: '{ .spec.clusterIP }'
   {{- end }}
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.database }' 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.username }' 
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
+        jsonpath: '{ .data.password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.username }' 
   - name: READONLY_PORT
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.portro }'
   - name: READWRITE_PORT
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.portrw }' 

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

@@ -16,10 +16,10 @@ primary:
   resources:
     limits:
       cpu: 1000m
-      memory: 1024Mi
+      memory: 2048Mi
     requests:
       cpu: 1000m
-      memory: 1024Mi
+      memory: 2048Mi
 
 
 ## @section Persistence parameters

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

@@ -9,31 +9,26 @@ credential:
   - name: HOST
     valueFrom:
       serviceRef:
-        name: {{ include "common.names.fullname" . }}
+        name: {{ include "common.names.fullname" . }}-router
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.database }' 
+  {{- end }} 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.username }' 
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
+        jsonpath: '{ .data.password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.username }' 
   - name: READONLY_PORT
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.portro }'
   - name: READWRITE_PORT
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.portrw }' 

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

@@ -9,31 +9,26 @@ credential:
   - name: HOST
     valueFrom:
       serviceRef:
-        name: {{ include "common.names.fullname" . }}
+        name: {{ include "common.names.fullname" . }}-router
         jsonpath: '{ .spec.clusterIP }'
   {{- end }}
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.database }' 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.username }' 
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
+        jsonpath: '{ .data.password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.username }' 
   - name: READONLY_PORT
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.portro }'
   - name: READWRITE_PORT
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
+        name: {{ template "common.names.fullname" . }}-svcbind-administrator-user
         jsonpath: '{ .data.portrw }'