feat: kbcli support connect wesql with vtgate (#3850)

Co-authored-by: 1aal <1aal@users.noreply.github.com>
apecloud · Nov 21, 2023 · 18e2ab9 · 18e2ab9
1 parent e919439
commit 18e2ab9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/apecloud-mysql/templates/clusterdefinition.yaml b/apecloud-mysql/templates/clusterdefinition.yaml
@@ -419,7 +419,7 @@ spec:
             command: ["/scripts/vtctld.sh"]
             volumeMounts:
               - name: scripts
-                mountPath: /scripts 
+                mountPath: /scripts
           - name: vtconsensus
             imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
             ports:
@@ -455,7 +455,7 @@ spec:
               - name: mysql-scale-config
                 mountPath: /conf
     - name: vtgate
-      characterType: vtgate
+      characterType: mysql
       workloadType: Stateless
       scriptSpecs:
         - name: apecloud-mysql-scripts
@@ -490,7 +490,7 @@ spec:
             image: busybox:1.35
             env:
               - name: VTCTLD_HOST
-                value: "$(KB_CLUSTER_NAME)-vtcontroller-headless" 
+                value: "$(KB_CLUSTER_NAME)-vtcontroller-headless"
               - name: VTCTLD_GRPC_PORT
                 value: "15999"
             command: ["/scripts/wait-for-service.sh", "vtctld", "$(VTCTLD_HOST)", "$(VTCTLD_GRPC_PORT)"]
@@ -536,6 +536,8 @@ spec:
                 value: "2379"
               - name: TOPOLOGY_FLAGS
                 value: "--topo_implementation etcd2 --topo_global_server_address $(ETCD_SERVER):$(ETCD_PORT) --topo_global_root /vitess/global"
+              - name: MYSQL_UNIX_PORT
+                value: "/tmp/mysql.sock"
             command: ["/scripts/vtgate.sh"]
             volumeMounts:
               - name: scripts

diff --git a/postgresql/templates/configconstraint-14.yaml b/postgresql/templates/configconstraint-14.yaml
@@ -17,12 +17,12 @@ spec:
     matchLabels:
       "apps.kubeblocks.postgres.patroni/role": "master"
 
-  # top level mysql configuration type
+  # top level pg configuration type
   cfgSchemaTopLevelName: PGParameter
 
   # ConfigurationSchema that impose restrictions on engine parameter's rule
   configurationSchema:
-    # schema: auto generate from mmmcue scripts
+    # schema: auto generate from cue scripts
     # example: ../../internal/configuration/testdata/mysql_openapi.json
     cue: |-
       {{- .Files.Get "config/pg14-config-constraint.cue" | nindent 6 }}