chore: udpate postgresql examples (#1139)

addons-cluster/postgresql/templates/_helpers.tpl

@@ -19,14 +19,14 @@ Define postgresql ComponentSpec with ComponentDefinition.
   topology: {{ .Values.mode }}
   componentSpecs:
     - name: {{ include "postgresql-cluster.component-name" . }}
+      serviceVersion: {{ .Values.version }}
       labels:
         {{- include "postgresql-cluster.patroni-scope-label" . | indent 8 }}
-      {{- include "postgresql-cluster.replicaCount" . | indent 6 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
       {{- include "kblib.componentMonitor" . | indent 6 }}
+      {{- include "postgresql-cluster.replicaCount" . | indent 6 }}
       {{- include "kblib.componentResources" . | indent 6 }}
       {{- include "kblib.componentStorages" . | indent 6 }}
-      {{- if .Values.etcd.proxyEnabled }}
+      {{- if .Values.etcd.enabled }}
       serviceRefs:
       {{ include "postgresql-cluster.serviceRef" . | indent 6 }}
       {{- end }}

addons-cluster/postgresql/templates/etcd-service-descriptor-example.yaml

@@ -1,3 +1,4 @@
+{{- if and .Values.etcd.enabled (eq .Values.etcd.meta.mode "serviceref") }}
 apiVersion: apps.kubeblocks.io/v1
 kind: ServiceDescriptor
 metadata:
@@ -8,4 +9,4 @@ spec:
   serviceVersion: 3.5.6
   endpoint:
     value: "etcd-cluster-etcd.default.svc.cluster.local:2379"  # etcd service endpoint
-    
+{{- end }}

addons-cluster/postgresql/values.yaml

@@ -37,20 +37,16 @@ requests:
 ##
 storage: 20
 
-## @param monitor sidecar
-sidecars:
- - exporter
-
 etcd:
-  proxyEnabled: false
+  enabled: false
   meta:
     mode: serviceref # optional: incluster, serviceref
     serviceRef:
-      namespace: 
-      cluster: 
-        name: 
-        component: 
-        service: 
-        port: 
+      namespace:
+      cluster:
+        name:
+        component:
+        service:
+        port:
         credential:
       serviceDescriptor: postgres-etcd-descriptor # example: postgres-etcd-descriptor

addons/postgresql/templates/clusterdefinition.yaml

@@ -6,12 +6,8 @@ metadata:
     {{- include "postgresql.labels" . | nindent 4 }}
 spec:
   topologies:
-    - name: standalone
-      components:
-        - name: postgresql
-          compDef: {{ include "postgresql.componentDefNamePrefix" . }}
-      default: true
     - name: replication
       components:
         - name: postgresql
           compDef: {{ include "postgresql.componentDefNamePrefix" . }}
+      default: true

examples/apecloud-mysql/cluster.yaml

@@ -3,7 +3,7 @@ kind: Cluster
 metadata:
   name: acmysql-cluster
   namespace: default
-  labels: 
+  labels:
     auditLogEnabled: "false"
 spec:
   # Specifies the behavior when a Cluster is deleted.