From 7d23d6d63c15a64ba58593f83e27fac7f1d29017 Mon Sep 17 00:00:00 2001
From: kizuna-lek <asd98041@qq.com>
Date: Thu, 10 Oct 2024 11:18:01 +0800
Subject: [PATCH] feat: upgrade official-postgresql to 0.9 api and rename to
 vanilla-postgresql in release 0.9

---
 .../release-addons-cluster-chart.yml          |   2 +-
 .github/workflows/release-chart.yml           |   2 +-
 .../templates/NOTES.txt                       |   2 -
 .../templates/cluster.yaml                    |  13 -
 .../.helmignore                               |   0
 .../vanilla-postgresql-cluster/Chart.lock     |   6 +
 .../Chart.yaml                                |  11 +-
 .../charts/kblib-0.1.0.tgz                    | Bin 0 -> 3311 bytes
 .../templates/NOTES.txt                       |   2 +
 .../templates/_helpers.tpl                    |   2 +-
 .../templates/cluster.yaml                    |  13 +
 .../templates/rbac.yaml                       |   0
 .../templates/validate.yaml                   |   0
 .../values.schema.json                        |   2 +-
 .../values.yaml                               |   4 +-
 .../templates/_helpers.tpl                    |  79 -----
 .../templates/clusterdefinition.yaml          | 196 ------------
 .../templates/clusterversion.yaml             |  51 ----
 .../templates/scripts.yaml                    |   8 -
 .../.helmignore                               |   0
 .../Chart.yaml                                |   7 +-
 .../config/pg12-config-constraint.cue         |   0
 .../config/pg12-config.tpl                    |   0
 .../config/pg14-config-constraint.cue         |   0
 .../config/pg14-config.tpl                    |   0
 .../vanilla-postgresql/templates/_helpers.tpl | 286 ++++++++++++++++++
 .../templates/clusterdefinition.yaml          |  17 ++
 .../vanilla-postgresql/templates/cmpd-12.yaml |  29 ++
 .../vanilla-postgresql/templates/cmpd-14.yaml |  29 ++
 addons/vanilla-postgresql/templates/cmpv.yaml |  27 ++
 .../templates/configconstraint-12.yaml        |   4 +-
 .../templates/configconstraint-14.yaml        |   4 +-
 .../templates/configmap-12.yaml               |   4 +-
 .../templates/configmap-14.yaml               |   4 +-
 .../vanilla-postgresql/templates/scripts.yaml |   8 +
 .../values.yaml                               |  51 ++--
 examples/official-postgresql/README.md        |  30 +-
 examples/official-postgresql/cluster.yaml     |  10 +-
 .../official-postgresql/horizontalscale.yaml  |   4 +-
 examples/official-postgresql/restart.yaml     |   4 +-
 examples/official-postgresql/start.yaml       |   4 +-
 examples/official-postgresql/stop.yaml        |   4 +-
 .../official-postgresql/verticalscale.yaml    |   4 +-
 .../official-postgresql/volumeexpand.yaml     |   4 +-
 44 files changed, 497 insertions(+), 430 deletions(-)
 delete mode 100644 addons-cluster/official-postgresql-cluster/templates/NOTES.txt
 delete mode 100644 addons-cluster/official-postgresql-cluster/templates/cluster.yaml
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/.helmignore (100%)
 create mode 100644 addons-cluster/vanilla-postgresql-cluster/Chart.lock
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/Chart.yaml (70%)
 create mode 100644 addons-cluster/vanilla-postgresql-cluster/charts/kblib-0.1.0.tgz
 create mode 100644 addons-cluster/vanilla-postgresql-cluster/templates/NOTES.txt
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/templates/_helpers.tpl (79%)
 create mode 100644 addons-cluster/vanilla-postgresql-cluster/templates/cluster.yaml
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/templates/rbac.yaml (100%)
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/templates/validate.yaml (100%)
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/values.schema.json (97%)
 rename addons-cluster/{official-postgresql-cluster => vanilla-postgresql-cluster}/values.yaml (87%)
 delete mode 100644 addons/official-postgresql/templates/_helpers.tpl
 delete mode 100644 addons/official-postgresql/templates/clusterdefinition.yaml
 delete mode 100644 addons/official-postgresql/templates/clusterversion.yaml
 delete mode 100644 addons/official-postgresql/templates/scripts.yaml
 rename addons/{official-postgresql => vanilla-postgresql}/.helmignore (100%)
 rename addons/{official-postgresql => vanilla-postgresql}/Chart.yaml (67%)
 rename addons/{official-postgresql => vanilla-postgresql}/config/pg12-config-constraint.cue (100%)
 rename addons/{official-postgresql => vanilla-postgresql}/config/pg12-config.tpl (100%)
 rename addons/{official-postgresql => vanilla-postgresql}/config/pg14-config-constraint.cue (100%)
 rename addons/{official-postgresql => vanilla-postgresql}/config/pg14-config.tpl (100%)
 create mode 100644 addons/vanilla-postgresql/templates/_helpers.tpl
 create mode 100644 addons/vanilla-postgresql/templates/clusterdefinition.yaml
 create mode 100644 addons/vanilla-postgresql/templates/cmpd-12.yaml
 create mode 100644 addons/vanilla-postgresql/templates/cmpd-14.yaml
 create mode 100644 addons/vanilla-postgresql/templates/cmpv.yaml
 rename addons/{official-postgresql => vanilla-postgresql}/templates/configconstraint-12.yaml (80%)
 rename addons/{official-postgresql => vanilla-postgresql}/templates/configconstraint-14.yaml (80%)
 rename addons/{official-postgresql => vanilla-postgresql}/templates/configmap-12.yaml (85%)
 rename addons/{official-postgresql => vanilla-postgresql}/templates/configmap-14.yaml (85%)
 create mode 100644 addons/vanilla-postgresql/templates/scripts.yaml
 rename addons/{official-postgresql => vanilla-postgresql}/values.yaml (57%)

diff --git a/.github/workflows/release-addons-cluster-chart.yml b/.github/workflows/release-addons-cluster-chart.yml
index 4a6b2851d..50044f246 100644
--- a/.github/workflows/release-addons-cluster-chart.yml
+++ b/.github/workflows/release-addons-cluster-chart.yml
@@ -36,7 +36,7 @@ on:
           - nebula-cluster
           - neon-cluster
           - oceanbase-ce-cluster
-          - official-postgresql-cluster
+          - vanilla-postgresql-cluster
           - opengauss-cluster
           - openldap-cluster
           - opensearch-cluster
diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml
index 6be553f5c..0865c06c2 100644
--- a/.github/workflows/release-chart.yml
+++ b/.github/workflows/release-chart.yml
@@ -35,7 +35,7 @@ on:
           - nebula
           - neon
           - oceanbase-ce
-          - official-postgresql
+          - vanilla-postgresql
           - opengauss
           - openldap
           - opensearch
diff --git a/addons-cluster/official-postgresql-cluster/templates/NOTES.txt b/addons-cluster/official-postgresql-cluster/templates/NOTES.txt
deleted file mode 100644
index 2b76c0505..000000000
--- a/addons-cluster/official-postgresql-cluster/templates/NOTES.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1. By default, the helm chart will create an Official PostgreSQL cluster with the same version as the Chart appVersion.
-2. If you need to create a different version, you need to specify the version through clusterVersionOverride value.
diff --git a/addons-cluster/official-postgresql-cluster/templates/cluster.yaml b/addons-cluster/official-postgresql-cluster/templates/cluster.yaml
deleted file mode 100644
index e4b45617e..000000000
--- a/addons-cluster/official-postgresql-cluster/templates/cluster.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- include "kblib.clusterCommon" . }}
-  clusterDefinitionRef: official-postgresql
-  componentSpecs:
-    - name: postgresql
-      componentDefRef: postgresql
-      {{- include "kblib.componentMonitor" . | indent 6 }}
-      {{- include "official-postgresql-cluster.replicaCount" . | indent 6 }}
-      serviceAccountName: {{ include "kblib.serviceAccountName" . }}
-      switchPolicy:
-        type: Noop
-      {{- include "kblib.componentResources" . | indent 6 }}
-      {{- include "kblib.componentStorages" . | indent 6 }}
-      {{- include "kblib.componentServices" . | indent 6 }}
\ No newline at end of file
diff --git a/addons-cluster/official-postgresql-cluster/.helmignore b/addons-cluster/vanilla-postgresql-cluster/.helmignore
similarity index 100%
rename from addons-cluster/official-postgresql-cluster/.helmignore
rename to addons-cluster/vanilla-postgresql-cluster/.helmignore
diff --git a/addons-cluster/vanilla-postgresql-cluster/Chart.lock b/addons-cluster/vanilla-postgresql-cluster/Chart.lock
new file mode 100644
index 000000000..40e5e8722
--- /dev/null
+++ b/addons-cluster/vanilla-postgresql-cluster/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: kblib
+  repository: file://../kblib
+  version: 0.1.0
+digest: sha256:6894d645e270bae072e3334549187801abc343630044c9da70e7a22e2ebfc55b
+generated: "2024-10-10T11:06:36.796796+08:00"
diff --git a/addons-cluster/official-postgresql-cluster/Chart.yaml b/addons-cluster/vanilla-postgresql-cluster/Chart.yaml
similarity index 70%
rename from addons-cluster/official-postgresql-cluster/Chart.yaml
rename to addons-cluster/vanilla-postgresql-cluster/Chart.yaml
index 64750047f..060c596d3 100644
--- a/addons-cluster/official-postgresql-cluster/Chart.yaml
+++ b/addons-cluster/vanilla-postgresql-cluster/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-name: official-postgresql-cluster
+name: vanilla-postgresql-cluster
 type: application
 version: 0.9.0
-description: A Official PostgreSQL cluster definition Helm chart for Kubernetes
+description: A Vanilla PostgreSQL cluster Helm chart for Kubernetes
 
 dependencies:
   - name: kblib
@@ -21,8 +21,9 @@ keywords:
   - database
   - sql
   - cluster
+  - vanilla
 
-home: https://github.com/apecloud/kubeblocks/tree/main/deploy/apecloud-postgresql-cluster
+home: https://github.com/apecloud/kubeblocks/tree/main/deploy/vanilla-postgresql-cluster
 icon: https://kubeblocks.io/img/logo.png
 
 maintainers:
@@ -31,9 +32,9 @@ maintainers:
 
 sources:
   - https://github.com/apecloud/kubeblocks/
-  - https://github.com/apecloud/kubeblocks/tree/main/deploy/apecloud-postgresql
+  - https://github.com/apecloud/kubeblocks/tree/main/deploy/vanilla-postgresql
 
 annotations:
-  kubeblocks.io/clusterVersions: "14.8.0,12.15.0"
+  kubeblocks.io/clusterVersions: "14.7.0,12.15.0"
   kubeblocks.io/multiCV: "true"
   category: Database
\ No newline at end of file
diff --git a/addons-cluster/vanilla-postgresql-cluster/charts/kblib-0.1.0.tgz b/addons-cluster/vanilla-postgresql-cluster/charts/kblib-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..642e4f658c4a368dbccb744e21ff3b3dd0b117d7
GIT binary patch
literal 3311
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

literal 0
HcmV?d00001

diff --git a/addons-cluster/vanilla-postgresql-cluster/templates/NOTES.txt b/addons-cluster/vanilla-postgresql-cluster/templates/NOTES.txt
new file mode 100644
index 000000000..930cbbd0e
--- /dev/null
+++ b/addons-cluster/vanilla-postgresql-cluster/templates/NOTES.txt
@@ -0,0 +1,2 @@
+1. By default, the helm chart will create a Vanilla PostgreSQL cluster with the same version as the Chart appVersion.
+2. If you need to create a different version, you need to specify the version through clusterVersionOverride value.
diff --git a/addons-cluster/official-postgresql-cluster/templates/_helpers.tpl b/addons-cluster/vanilla-postgresql-cluster/templates/_helpers.tpl
similarity index 79%
rename from addons-cluster/official-postgresql-cluster/templates/_helpers.tpl
rename to addons-cluster/vanilla-postgresql-cluster/templates/_helpers.tpl
index ea2a10c8c..0e8202318 100644
--- a/addons-cluster/official-postgresql-cluster/templates/_helpers.tpl
+++ b/addons-cluster/vanilla-postgresql-cluster/templates/_helpers.tpl
@@ -3,7 +3,7 @@ Define replica count.
 standalone mode: 1
 replication mode: 2
 */}}
-{{- define "official-postgresql-cluster.replicaCount" }}
+{{- define "vanilla-postgresql-cluster.replicaCount" }}
 {{- if eq .Values.mode "standalone" }}
 replicas: 1
 {{- else if eq .Values.mode "replication" }}
diff --git a/addons-cluster/vanilla-postgresql-cluster/templates/cluster.yaml b/addons-cluster/vanilla-postgresql-cluster/templates/cluster.yaml
new file mode 100644
index 000000000..f833aff4d
--- /dev/null
+++ b/addons-cluster/vanilla-postgresql-cluster/templates/cluster.yaml
@@ -0,0 +1,13 @@
+{{- include "kblib.clusterCommon" . }}
+clusterDef: vanilla-postgresql
+componentSpecs:
+  - name: postgresql
+    componentDef: vanilla-postgresql
+      {{- include "kblib.componentMonitor" . | indent 6 }}
+      {{- include "vanilla-postgresql-cluster.replicaCount" . | indent 6 }}
+    serviceAccountName: {{ include "kblib.serviceAccountName" . }}
+      {{- include "kblib.componentResources" . | indent 6 }}
+      {{- include "kblib.componentStorages" . | indent 6 }}
+    enabledLogs:
+      - running
+    serviceVersion: {{ .Values.version }}
\ No newline at end of file
diff --git a/addons-cluster/official-postgresql-cluster/templates/rbac.yaml b/addons-cluster/vanilla-postgresql-cluster/templates/rbac.yaml
similarity index 100%
rename from addons-cluster/official-postgresql-cluster/templates/rbac.yaml
rename to addons-cluster/vanilla-postgresql-cluster/templates/rbac.yaml
diff --git a/addons-cluster/official-postgresql-cluster/templates/validate.yaml b/addons-cluster/vanilla-postgresql-cluster/templates/validate.yaml
similarity index 100%
rename from addons-cluster/official-postgresql-cluster/templates/validate.yaml
rename to addons-cluster/vanilla-postgresql-cluster/templates/validate.yaml
diff --git a/addons-cluster/official-postgresql-cluster/values.schema.json b/addons-cluster/vanilla-postgresql-cluster/values.schema.json
similarity index 97%
rename from addons-cluster/official-postgresql-cluster/values.schema.json
rename to addons-cluster/vanilla-postgresql-cluster/values.schema.json
index 6f7dd3e87..65e9e3bd2 100644
--- a/addons-cluster/official-postgresql-cluster/values.schema.json
+++ b/addons-cluster/vanilla-postgresql-cluster/values.schema.json
@@ -6,7 +6,7 @@
       "title": "Version",
       "description": "Cluster version.",
       "type": "string",
-      "default": "official-postgresql-14.7"
+      "default": "vanilla-postgresql-14.7"
     },
     "mode": {
       "title": "Mode",
diff --git a/addons-cluster/official-postgresql-cluster/values.yaml b/addons-cluster/vanilla-postgresql-cluster/values.yaml
similarity index 87%
rename from addons-cluster/official-postgresql-cluster/values.yaml
rename to addons-cluster/vanilla-postgresql-cluster/values.yaml
index a250dd9ab..85c6bb052 100644
--- a/addons-cluster/official-postgresql-cluster/values.yaml
+++ b/addons-cluster/vanilla-postgresql-cluster/values.yaml
@@ -1,10 +1,10 @@
-# Default values for Official PostgreSQL.
+# Default values for Vanilla PostgreSQL.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 ## @param version Postgresql cluster version
 ##
-version: official-postgresql-14.7
+version: 14.7.0
 
 ## @param mode postgresql cluster topology mode, standalone, replication
 ##
diff --git a/addons/official-postgresql/templates/_helpers.tpl b/addons/official-postgresql/templates/_helpers.tpl
deleted file mode 100644
index cf508863e..000000000
--- a/addons/official-postgresql/templates/_helpers.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "official-postgresql.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "official-postgresql.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "official-postgresql.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "official-postgresql.labels" -}}
-helm.sh/chart: {{ include "official-postgresql.chart" . }}
-{{ include "official-postgresql.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "official-postgresql.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "official-postgresql.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "official-postgresql.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "official-postgresql.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Return the name for a custom database to create
-*/}}
-{{- define "official-postgresql.database" -}}
-{{- .Values.auth.database -}}
-{{- end -}}
-
-{{/*
-Generate scripts configmap
-*/}}
-{{- define "official-postgresql.extend.scripts" -}}
-{{- range $path, $_ :=  $.Files.Glob "scripts/**" }}
-{{ $path | base }}: |-
-{{- $.Files.Get $path | nindent 2 }}
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/addons/official-postgresql/templates/clusterdefinition.yaml b/addons/official-postgresql/templates/clusterdefinition.yaml
deleted file mode 100644
index 12b191dee..000000000
--- a/addons/official-postgresql/templates/clusterdefinition.yaml
+++ /dev/null
@@ -1,196 +0,0 @@
-apiVersion: apps.kubeblocks.io/v1alpha1
-kind: ClusterDefinition
-metadata:
-  name: official-postgresql
-  labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
-spec:
-  type: postgresql
-  connectionCredential:
-    username: postgres
-    password: "$(RANDOM_PASSWD)"
-    endpoint: "$(SVC_FQDN):$(SVC_PORT_tcp-postgresql)"
-    host: "$(SVC_FQDN)"
-    port: "$(SVC_PORT_tcp-postgresql)"
-  componentDefs:
-    - name: postgresql
-      workloadType: Replication
-      characterType: postgresql
-      probes:
-        roleProbe:
-          failureThreshold: {{ .Values.roleProbe.failureThreshold }}
-          periodSeconds: {{ .Values.roleProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.roleProbe.timeoutSeconds }}
-      configSpecs:
-        - name: official-postgresql-configuration
-          templateRef: official-postgresql14-configuration
-          constraintRef: official-postgresql14-cc
-          keys:
-            - postgresql.conf
-          namespace: {{ .Release.Namespace }}
-          volumeName: postgresql-config
-          defaultMode: 0444
-      scriptSpecs:
-        - name: official-postgresql-scripts
-          templateRef: official-postgresql-scripts
-          namespace: {{ .Release.Namespace }}
-          volumeName: scripts
-          defaultMode: 0555
-      service:
-        ports:
-          - name: tcp-postgresql
-            port: 5432
-            targetPort: tcp-postgresql
-      volumeTypes:
-        - name: data
-          type: data
-      podSpec:
-        initContainers:
-          - name: init-syncer
-            image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }}
-            imagePullPolicy: Always
-            command:
-              - sh
-              - -c
-              - "cp -r /bin/syncer /config /kubeblocks/"
-            volumeMounts:
-              - name: kubeblocks
-                mountPath: /kubeblocks
-        securityContext:
-          runAsUser: 0
-          fsGroup: 103
-          runAsGroup: 103
-        containers:
-          - name: postgresql
-            imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
-            securityContext:
-              runAsUser: 0
-            command:
-              - /kubeblocks/syncer
-              - --config-path
-              - /kubeblocks/config/components
-              - --port
-              - "3601"
-              - --
-              - docker-entrypoint.sh
-              - --config-file={{ .Values.confPath }}/postgresql.conf
-              - --hba_file={{ .Values.confPath }}/pg_hba.conf
-            volumeMounts:
-              - name: dshm
-                mountPath: /dev/shm
-              - name: data
-                mountPath: {{ .Values.dataMountPath }}
-              - name: postgresql-config
-                mountPath: {{ .Values.confMountPath }}
-              - name: scripts
-                mountPath: /kb-scripts
-              - name: kubeblocks
-                mountPath: /kubeblocks
-            ports:
-              - name: tcp-postgresql
-                containerPort: 5432
-            env:
-              - name: ALLOW_NOSSL
-                value: "true"
-              - name: POSTGRESQL_PORT_NUMBER
-                value: "5432"
-              - name: PGDATA
-                value: {{ .Values.dataPath }}
-              - name: PGCONF
-                value: {{ .Values.confPath }}
-              - name: POSTGRESQL_MOUNTED_CONF_DIR
-                value: {{ .Values.confMountPath }}
-              - name: POD_IP
-                valueFrom:
-                  fieldRef:
-                    apiVersion: v1
-                    fieldPath: status.podIP
-              - name: POD_NAMESPACE
-                valueFrom:
-                  fieldRef:
-                    apiVersion: v1
-                    fieldPath: metadata.namespace
-              - name: POSTGRES_USER
-                valueFrom:
-                  secretKeyRef:
-                    name: $(CONN_CREDENTIAL_SECRET_NAME)
-                    key: username
-                    optional: false
-              - name: POSTGRES_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: $(CONN_CREDENTIAL_SECRET_NAME)
-                    key: password
-                    optional: false
-              - name: PGUSER
-                valueFrom:
-                  secretKeyRef:
-                    name: $(CONN_CREDENTIAL_SECRET_NAME)
-                    key: username
-                    optional: false
-              - name: PGPASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: $(CONN_CREDENTIAL_SECRET_NAME)
-                    key: password
-                    optional: false
-        volumes:
-          - name: dshm
-            emptyDir:
-              medium: Memory
-              {{- with .Values.shmVolume.sizeLimit }}
-              sizeLimit: {{ . }}
-              {{- end }}
-      systemAccounts:
-        cmdExecutorConfig:
-          image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ default .Values.image.tag }}
-          command:
-            - psql
-          args:
-            - -h$(KB_ACCOUNT_ENDPOINT)
-            - -c
-            - $(KB_ACCOUNT_STATEMENT)
-          env:
-            - name: PGUSER
-              valueFrom:
-                secretKeyRef:
-                  name: $(CONN_CREDENTIAL_SECRET_NAME)
-                  key: username
-                  optional: false
-            - name: PGPASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: $(CONN_CREDENTIAL_SECRET_NAME)
-                  key: password
-                  optional: false
-        passwordConfig:
-          length: 10
-          numDigits: 5
-          numSymbols: 0
-          letterCase: MixedCases
-        accounts:
-          - name: kbadmin
-            provisionPolicy: &kbAdminAcctRef
-              type: CreateByStmt
-              scope: AnyPods
-              statements:
-                creation: CREATE USER $(USERNAME) SUPERUSER PASSWORD '$(PASSWD)';
-                update: ALTER USER $(USERNAME) WITH PASSWORD '$(PASSWD)';
-          - name: kbdataprotection
-            provisionPolicy: *kbAdminAcctRef
-          - name: kbprobe
-            provisionPolicy: &kbReadonlyAcctRef
-              type: CreateByStmt
-              scope: AnyPods
-              statements:
-                creation: CREATE USER $(USERNAME) WITH PASSWORD '$(PASSWD)';  GRANT pg_monitor TO $(USERNAME);
-                update: ALTER USER $(USERNAME) WITH PASSWORD '$(PASSWD)';
-          - name: kbmonitoring
-            provisionPolicy: *kbReadonlyAcctRef
-          - name: kbreplicator
-            provisionPolicy:
-              type: CreateByStmt
-              scope: AnyPods
-              statements:
-                creation: CREATE USER $(USERNAME) WITH REPLICATION PASSWORD '$(PASSWD)';
-                update: ALTER USER $(USERNAME) WITH PASSWORD '$(PASSWD)';
diff --git a/addons/official-postgresql/templates/clusterversion.yaml b/addons/official-postgresql/templates/clusterversion.yaml
deleted file mode 100644
index 37a8c60a1..000000000
--- a/addons/official-postgresql/templates/clusterversion.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: apps.kubeblocks.io/v1alpha1
-kind: ClusterVersion
-metadata:
-  # major version of the component defined in values.yaml
-  name: official-postgresql-{{ .Values.image.tag }}
-  annotations:
-    kubeblocks.io/is-default-cluster-version: "true"
-  labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
-spec:
-  clusterDefinitionRef: official-postgresql
-  componentVersions:
-    - componentDefRef: postgresql
-      versionsContext:
-        containers:
-          - name: postgresql
-            image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
-      systemAccountSpec:
-        cmdExecutorConfig:
-          image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
-
----
-apiVersion: apps.kubeblocks.io/v1alpha1
-kind: ClusterVersion
-metadata:
-  name: official-postgresql-12.15
-  annotations:
-    kubeblocks.io/is-default-cluster-version: "false"
-  labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
-spec:
-  clusterDefinitionRef: official-postgresql
-  componentVersions:
-    - componentDefRef: postgresql
-      configSpecs:
-        # name needs to consistent with the name of the configmap defined in clusterDefinition, and replace the templateRef with postgres v12.15 configmap
-        - name: official-postgresql-configuration
-          templateRef: official-postgresql12-configuration
-          constraintRef: official-postgresql12-cc
-          keys:
-            - postgresql.conf
-          namespace: {{ .Release.Namespace }}
-          volumeName: postgresql-config
-          defaultMode: 0444
-      versionsContext:
-        containers:
-          - name: postgresql
-            image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:12.15
-      systemAccountSpec:
-        cmdExecutorConfig:
-          image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:12.15
diff --git a/addons/official-postgresql/templates/scripts.yaml b/addons/official-postgresql/templates/scripts.yaml
deleted file mode 100644
index 6a88a12f9..000000000
--- a/addons/official-postgresql/templates/scripts.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: official-postgresql-scripts
-  labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
-data:
-  {{- include "official-postgresql.extend.scripts" . | nindent 2 }}
diff --git a/addons/official-postgresql/.helmignore b/addons/vanilla-postgresql/.helmignore
similarity index 100%
rename from addons/official-postgresql/.helmignore
rename to addons/vanilla-postgresql/.helmignore
diff --git a/addons/official-postgresql/Chart.yaml b/addons/vanilla-postgresql/Chart.yaml
similarity index 67%
rename from addons/official-postgresql/Chart.yaml
rename to addons/vanilla-postgresql/Chart.yaml
index 61728b80b..b1dafc62b 100644
--- a/addons/official-postgresql/Chart.yaml
+++ b/addons/vanilla-postgresql/Chart.yaml
@@ -1,12 +1,13 @@
 apiVersion: v2
-name: official-postgresql
-description: A Official PostgreSQL cluster definition Helm chart for Kubernetes
+name: vanilla-postgresql
+description: Vanilla-PostgreSQL is compatible with the native PostgreSQL kernel,
+  enabling it to quickly provide HA solutions for various variants based on the native PostgreSQL kernel.
 
 type: application
 
 version: 0.9.0
 
-# The helm chart contains multiple kernel versions of Official PostgreSQL,
+# The helm chart contains multiple kernel versions of Vanilla PostgreSQL,
 # and each PostgreSQL version corresponds to a clusterVersion object.
 # appVersion should be consistent with the highest PostgreSQL kernel version in clusterVersion.
 appVersion: "14.7"
diff --git a/addons/official-postgresql/config/pg12-config-constraint.cue b/addons/vanilla-postgresql/config/pg12-config-constraint.cue
similarity index 100%
rename from addons/official-postgresql/config/pg12-config-constraint.cue
rename to addons/vanilla-postgresql/config/pg12-config-constraint.cue
diff --git a/addons/official-postgresql/config/pg12-config.tpl b/addons/vanilla-postgresql/config/pg12-config.tpl
similarity index 100%
rename from addons/official-postgresql/config/pg12-config.tpl
rename to addons/vanilla-postgresql/config/pg12-config.tpl
diff --git a/addons/official-postgresql/config/pg14-config-constraint.cue b/addons/vanilla-postgresql/config/pg14-config-constraint.cue
similarity index 100%
rename from addons/official-postgresql/config/pg14-config-constraint.cue
rename to addons/vanilla-postgresql/config/pg14-config-constraint.cue
diff --git a/addons/official-postgresql/config/pg14-config.tpl b/addons/vanilla-postgresql/config/pg14-config.tpl
similarity index 100%
rename from addons/official-postgresql/config/pg14-config.tpl
rename to addons/vanilla-postgresql/config/pg14-config.tpl
diff --git a/addons/vanilla-postgresql/templates/_helpers.tpl b/addons/vanilla-postgresql/templates/_helpers.tpl
new file mode 100644
index 000000000..d0ce192f2
--- /dev/null
+++ b/addons/vanilla-postgresql/templates/_helpers.tpl
@@ -0,0 +1,286 @@
+{{/*
+Define postgresql cluster definition name
+*/}}
+{{- define "vanilla-postgresql.clusterDefinition" -}}
+vanilla-postgresql
+{{- end -}}
+
+{{/*
+Define postgresql component version name
+*/}}
+{{- define "vanilla-postgresql.componentVersion" -}}
+vanilla-postgresql
+{{- end -}}
+
+{{/*
+Define postgresql component definition name prefix
+*/}}
+{{- define "vanilla-postgresql.componentDefNamePrefix" -}}
+{{- printf "vanilla-postgresql-" -}}
+{{- end -}}
+
+{{/*
+Define vanilla-postgresql 12 component definition name prefix
+*/}}
+{{- define "vanilla-postgresql12.componentDefNamePrefix" -}}
+{{- if eq (len .Values.cmpdVersionPrefix.vanillaPostgresql12) 0 -}}
+{{- printf "vanilla-postgresql-12-" -}}
+{{- else -}}
+{{- printf "%s-" .Values.cmpdVersionPrefix.vanillaPostgresql12 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Define vanilla-postgresql 14 component definition name prefix
+*/}}
+{{- define "vanilla-postgresql14.componentDefNamePrefix" -}}
+{{- if eq (len .Values.cmpdVersionPrefix.vanillaPostgresql14) 0 -}}
+{{- printf "vanilla-postgresql-14-" -}}
+{{- else -}}
+{{- printf "%s-" .Values.cmpdVersionPrefix.vanillaPostgresql14 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Define vanilla-postgresql 12 component definition name
+*/}}
+{{- define "vanilla-postgresql12.compDefName" -}}
+{{- if eq (len .Values.cmpdVersionPrefix.vanillaPostgresql12) 0 -}}
+vanilla-postgresql-12
+{{- else -}}
+{{ .Values.cmpdVersionPrefix.vanillaPostgresql12 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Define vanilla-postgresql 14 component definition name with Chart.Version suffix
+*/}}
+{{- define "vanilla-postgresql14.compDefName" -}}
+{{- if eq (len .Values.cmpdVersionPrefix.vanillaPostgresql14) 0 -}}
+vanilla-postgresql-14
+{{- else -}}
+{{ .Values.cmpdVersionPrefix.vanillaPostgresql14 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "vanilla-postgresql.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "vanilla-postgresql.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "vanilla-postgresql.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "vanilla-postgresql.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "vanilla-postgresql.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "vanilla-postgresql.labels" -}}
+helm.sh/chart: {{ include "vanilla-postgresql.chart" . }}
+{{ include "vanilla-postgresql.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Define vanillaPostgresql12 component configuration template name
+*/}}
+{{- define "vanilla-postgresql12.configurationTemplate" -}}
+vanilla-postgresql12-configuration
+{{- end -}}
+
+{{/*
+Define postgresql14 component configuration template name
+*/}}
+{{- define "vanilla-postgresql14.configurationTemplate" -}}
+vanilla-postgresql14-configuration
+{{- end -}}
+
+{{/*
+Define postgresql12 component config constraint name
+*/}}
+{{- define "vanilla-postgresql12.configConstraint" -}}
+vanilla-postgresql12-cc
+{{- end -}}
+
+{{/*
+Define postgresql14 component config constraint name
+*/}}
+{{- define "vanilla-postgresql14.configConstraint" -}}
+vanilla-postgresql14-cc
+{{- end -}}
+
+{{/*
+Define postgresql scripts configMap template name
+*/}}
+{{- define "vanilla-postgresql.scriptsTemplate" -}}
+vanilla-postgresql-scripts
+{{- end -}}
+
+{{/*
+Generate scripts configmap
+*/}}
+{{- define "vanilla-postgresql.extend.scripts" -}}
+{{- range $path, $_ :=  $.Files.Glob "scripts/**" }}
+{{ $path | base }}: |-
+{{- $.Files.Get $path | nindent 2 }}
+{{- end }}
+{{- end }}
+
+{{- define "vanilla-postgresql.spec.common" -}}
+provider: kubeblocks
+description: {{ .Chart.Description }}
+serviceKind: {{ .Chart.Name }}
+logConfigs:
+  {{- range $name,$pattern := .Values.logConfigs }}
+  - name: {{ $name }}
+    filePathPattern: {{ $pattern }}
+  {{- end }}
+services:
+  - name: vanilla-postgresql
+    spec:
+      ports:
+        - name: tcp-postgresql
+          port: 5432
+          targetPort: tcp-postgresql
+    roleSelector: primary
+roles:
+  - name: primary
+    serviceable: true
+    writable: true
+  - name: secondary
+    serviceable: true
+    writable: false
+volumes:
+  - name: data
+    needSnapshot: true
+updateStrategy: BestEffortParallel
+vars:
+  - name: POSTGRES_USER
+    valueFrom:
+      credentialVarRef:
+        name: postgres
+        optional: false
+        username: Required
+  - name: POSTGRES_PASSWORD
+    valueFrom:
+      credentialVarRef:
+        name: postgres
+        optional: false
+        password: Required
+systemAccounts:
+  - name: postgres
+    initAccount: true
+    passwordGenerationPolicy:
+      length: 10
+      numDigits: 5
+      numSymbols: 0
+      letterCase: MixedCases
+{{- end -}}
+
+{{- define "vanilla-postgresql.spec.runtime.common" -}}
+initContainers:
+  - name: init-syncer
+    image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }}
+    imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
+    command:
+      - sh
+      - -c
+      - "cp -r /bin/syncer /config /kubeblocks/"
+    volumeMounts:
+      - name: kubeblocks
+        mountPath: /kubeblocks
+securityContext:
+  runAsUser: 0
+  fsGroup: 103
+  runAsGroup: 103
+volumes:
+  - name: dshm
+    emptyDir:
+      medium: Memory
+          {{- with .Values.shmVolume.sizeLimit }}
+      sizeLimit: {{ . }}
+          {{- end }}
+{{- end -}}
+
+{{- define "vanilla-postgresql.spec.runtime.container.common" -}}
+name: postgresql
+imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
+securityContext:
+  runAsUser: 0
+command:
+  - /kubeblocks/syncer
+  - --config-path
+  - /kubeblocks/config/components
+  - --port
+  - "3601"
+  - --
+  - docker-entrypoint.sh
+  - --config-file={{ .Values.confPath }}/postgresql.conf
+  - --hba_file={{ .Values.confPath }}/pg_hba.conf
+volumeMounts:
+  - name: dshm
+    mountPath: /dev/shm
+  - name: data
+    mountPath: {{ .Values.dataMountPath }}
+  - name: postgresql-config
+    mountPath: {{ .Values.confMountPath }}
+  - name: scripts
+    mountPath: /kb-scripts
+  - name: kubeblocks
+    mountPath: /kubeblocks
+ports:
+  - name: tcp-postgresql
+    containerPort: 5432
+env:
+  - name: ALLOW_NOSSL
+    value: "true"
+  - name: POSTGRESQL_PORT_NUMBER
+    value: "5432"
+  - name: PGDATA
+    value: {{ .Values.dataPath }}
+  - name: PGCONF
+    value: {{ .Values.confPath }}
+  - name: POSTGRESQL_MOUNTED_CONF_DIR
+    value: {{ .Values.confMountPath }}
+  - name: PGUSER
+    value: $(POSTGRES_USER)
+  - name: PGPASSWORD
+    value: $(POSTGRES_PASSWORD)
+  # fixme: only used for lorry in 0.9
+  - name: KB_SERVICE_CHARACTER_TYPE
+    value: postgresql
+{{- end -}}
\ No newline at end of file
diff --git a/addons/vanilla-postgresql/templates/clusterdefinition.yaml b/addons/vanilla-postgresql/templates/clusterdefinition.yaml
new file mode 100644
index 000000000..6e8235fc0
--- /dev/null
+++ b/addons/vanilla-postgresql/templates/clusterdefinition.yaml
@@ -0,0 +1,17 @@
+apiVersion: apps.kubeblocks.io/v1alpha1
+kind: ClusterDefinition
+metadata:
+  name: {{ include "vanilla-postgresql.clusterDefinition" . }}
+  labels:
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
+spec:
+  topologies:
+    - name: standalone
+      components:
+        - name: postgresql
+          compDef: {{ include "vanilla-postgresql.componentDefNamePrefix" . }}
+      default: true
+    - name: replication
+      components:
+        - name: postgresql
+          compDef: {{ include "vanilla-postgresql.componentDefNamePrefix" . }}
\ No newline at end of file
diff --git a/addons/vanilla-postgresql/templates/cmpd-12.yaml b/addons/vanilla-postgresql/templates/cmpd-12.yaml
new file mode 100644
index 000000000..7eee8492a
--- /dev/null
+++ b/addons/vanilla-postgresql/templates/cmpd-12.yaml
@@ -0,0 +1,29 @@
+apiVersion: apps.kubeblocks.io/v1alpha1
+kind: ComponentDefinition
+metadata:
+  name: {{ include "vanilla-postgresql12.compDefName" . }}
+  labels:
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
+spec:
+  {{- include "vanilla-postgresql.spec.common" . | nindent 2 }}
+  serviceVersion: {{ .Values.componentServiceVersion.vanillaPostgresql12 }}
+  configs:
+    - name: vanilla-postgresql-configuration
+      templateRef: {{ include "vanilla-postgresql12.configurationTemplate" . }}
+      constraintRef: {{ include "vanilla-postgresql12.configConstraint" . }}
+      keys:
+        - postgresql.conf
+      namespace: {{ .Release.Namespace }}
+      volumeName: postgresql-config
+      defaultMode: 0444
+  scripts:
+    - name: vanilla-postgresql-scripts
+      templateRef: {{ include "vanilla-postgresql.scriptsTemplate" . }}
+      namespace: {{ .Release.Namespace }}
+      volumeName: scripts
+      defaultMode: 0555
+  runtime:
+    {{- include "vanilla-postgresql.spec.runtime.common" . | nindent 4 }}
+    containers:
+      - image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tags.major12.minor15 }}
+        {{- include "vanilla-postgresql.spec.runtime.container.common" . | nindent 8 }}
\ No newline at end of file
diff --git a/addons/vanilla-postgresql/templates/cmpd-14.yaml b/addons/vanilla-postgresql/templates/cmpd-14.yaml
new file mode 100644
index 000000000..e5f1c0e98
--- /dev/null
+++ b/addons/vanilla-postgresql/templates/cmpd-14.yaml
@@ -0,0 +1,29 @@
+apiVersion: apps.kubeblocks.io/v1alpha1
+kind: ComponentDefinition
+metadata:
+  name: {{ include "vanilla-postgresql14.compDefName" . }}
+  labels:
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
+spec:
+  {{- include "vanilla-postgresql.spec.common" . | nindent 2 }}
+  serviceVersion: {{ .Values.componentServiceVersion.vanillaPostgresql12 }}
+  configs:
+    - name: vanilla-postgresql-configuration
+      templateRef: {{ include "vanilla-postgresql14.configurationTemplate" . }}
+      constraintRef: {{ include "vanilla-postgresql14.configConstraint" . }}
+      keys:
+        - postgresql.conf
+      namespace: {{ .Release.Namespace }}
+      volumeName: postgresql-config
+      defaultMode: 0444
+  scripts:
+    - name: vanilla-postgresql-scripts
+      templateRef: {{ include "vanilla-postgresql.scriptsTemplate" . }}
+      namespace: {{ .Release.Namespace }}
+      volumeName: scripts
+      defaultMode: 0555
+  runtime:
+    {{- include "vanilla-postgresql.spec.runtime.common" . | nindent 4 }}
+    containers:
+      - image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tags.major14.minor07 }}
+        {{- include "vanilla-postgresql.spec.runtime.container.common" . | nindent 8 }}
\ No newline at end of file
diff --git a/addons/vanilla-postgresql/templates/cmpv.yaml b/addons/vanilla-postgresql/templates/cmpv.yaml
new file mode 100644
index 000000000..1607adf12
--- /dev/null
+++ b/addons/vanilla-postgresql/templates/cmpv.yaml
@@ -0,0 +1,27 @@
+apiVersion: apps.kubeblocks.io/v1alpha1
+kind: ComponentVersion
+metadata:
+  name: {{ include "vanilla-postgresql.componentVersion" . }}
+  labels:
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
+spec:
+  compatibilityRules:
+    - compDefs:
+        - {{ include "vanilla-postgresql12.componentDefNamePrefix" . }}
+      releases:
+        - 12.15.0
+    - compDefs:
+        - {{ include "vanilla-postgresql14.componentDefNamePrefix" . }}
+      releases:
+        - 14.7.0
+  releases:
+    - name: 12.15.0
+      changes:
+      serviceVersion: 12.15.0 # {{ .Values.componentServiceVersion.vanillaPostgresql12  }}
+      images:
+        postgresql: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tags.major12.minor15 }}
+    - name: 14.7.0
+      changes:
+      serviceVersion: 14.7.0
+      images:
+        postgresql: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tags.major14.minor07 }}
\ No newline at end of file
diff --git a/addons/official-postgresql/templates/configconstraint-12.yaml b/addons/vanilla-postgresql/templates/configconstraint-12.yaml
similarity index 80%
rename from addons/official-postgresql/templates/configconstraint-12.yaml
rename to addons/vanilla-postgresql/templates/configconstraint-12.yaml
index 59f86977e..b5ac6e7ad 100644
--- a/addons/official-postgresql/templates/configconstraint-12.yaml
+++ b/addons/vanilla-postgresql/templates/configconstraint-12.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps.kubeblocks.io/v1beta1
 kind: ConfigConstraint
 metadata:
-  name: official-postgresql12-cc
+  name: {{ include "vanilla-postgresql12.configConstraint" . }}
   labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
 spec:
   # ConfigurationSchema that impose restrictions on engine parameter's rule
   parametersSchema:
diff --git a/addons/official-postgresql/templates/configconstraint-14.yaml b/addons/vanilla-postgresql/templates/configconstraint-14.yaml
similarity index 80%
rename from addons/official-postgresql/templates/configconstraint-14.yaml
rename to addons/vanilla-postgresql/templates/configconstraint-14.yaml
index a3d58fb4d..759cb3d55 100644
--- a/addons/official-postgresql/templates/configconstraint-14.yaml
+++ b/addons/vanilla-postgresql/templates/configconstraint-14.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps.kubeblocks.io/v1beta1
 kind: ConfigConstraint
 metadata:
-  name: official-postgresql14-cc
+  name: {{ include "vanilla-postgresql14.configConstraint" . }}
   labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
 spec:
   # ConfigurationSchema that impose restrictions on engine parameter's rule
   parametersSchema:
diff --git a/addons/official-postgresql/templates/configmap-12.yaml b/addons/vanilla-postgresql/templates/configmap-12.yaml
similarity index 85%
rename from addons/official-postgresql/templates/configmap-12.yaml
rename to addons/vanilla-postgresql/templates/configmap-12.yaml
index d93002a62..f72280bad 100644
--- a/addons/official-postgresql/templates/configmap-12.yaml
+++ b/addons/vanilla-postgresql/templates/configmap-12.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: official-postgresql12-configuration
+  name: {{ include "vanilla-postgresql12.configurationTemplate" . }}
   labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
 data:
   postgresql.conf: |-
     {{- .Files.Get "config/pg12-config.tpl" | nindent 4 }}
diff --git a/addons/official-postgresql/templates/configmap-14.yaml b/addons/vanilla-postgresql/templates/configmap-14.yaml
similarity index 85%
rename from addons/official-postgresql/templates/configmap-14.yaml
rename to addons/vanilla-postgresql/templates/configmap-14.yaml
index 22045d3aa..7d9402ce0 100644
--- a/addons/official-postgresql/templates/configmap-14.yaml
+++ b/addons/vanilla-postgresql/templates/configmap-14.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: official-postgresql14-configuration
+  name: {{ include "vanilla-postgresql14.configurationTemplate" . }}
   labels:
-    {{- include "official-postgresql.labels" . | nindent 4 }}
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
 data:
   postgresql.conf: |-
     {{- .Files.Get "config/pg14-config.tpl" | nindent 4 }}
diff --git a/addons/vanilla-postgresql/templates/scripts.yaml b/addons/vanilla-postgresql/templates/scripts.yaml
new file mode 100644
index 000000000..2c2ef3643
--- /dev/null
+++ b/addons/vanilla-postgresql/templates/scripts.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "vanilla-postgresql.scriptsTemplate" . }}
+  labels:
+    {{- include "vanilla-postgresql.labels" . | nindent 4 }}
+data:
+  {{- include "vanilla-postgresql.extend.scripts" . | nindent 2 }}
diff --git a/addons/official-postgresql/values.yaml b/addons/vanilla-postgresql/values.yaml
similarity index 57%
rename from addons/official-postgresql/values.yaml
rename to addons/vanilla-postgresql/values.yaml
index 2a5f0e7b9..b1f9385a0 100644
--- a/addons/official-postgresql/values.yaml
+++ b/addons/vanilla-postgresql/values.yaml
@@ -1,12 +1,19 @@
-# Default values for apecloud-postgresql.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+nameOverride: ""
+fullnameOverride: ""
+
 image:
   registry: docker.io
   repository: postgres
-  tag: 14.7
   digest: ""
+  tags:
+    major12:
+      minor15: 12.15
+    major14:
+      minor07: 14.7
+
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -20,9 +27,7 @@ image:
   ##   - myRegistryKeySecretName
   ##
   pullSecrets: [ ]
-  ## Set to true if you would like to see extra information on logs
-  ##
-  debug: false
+
   syncer:
     repository: apecloud/syncer
     tag: "0.2.0"
@@ -33,23 +38,20 @@ confMountPath: /postgresql/mount_conf
 dataPath: /postgresql/volume_data/data
 confPath: /postgresql/volume_data/conf
 
-## Authentication parameters
-##
-auth:
-  ## @param auth.postgresPassword Password for the "postgres" admin user, leave empty
-  ## for random generated password.
-  ##
-  postgresPassword:
-  ## @param auth.database Name for a custom database to create
-  ##
-  database: "custom_db"
-## Set PostgreSQL preload extension shared libraries.
-## @param postgresqlSharedPreloadLibraries Shared preload libraries (comma-separated list)
-##
-postgresqlSharedPreloadLibraries: "pg_stat_statements, auto_explain"
-## Start PostgreSQL pod(s) without limitations on shm memory.
-## By default, docker and containerd (and possibly other container runtimes) limit `/dev/shm` to `64M`
-##
+logConfigs:
+  running: /postgresql/volume_data/data/log/postgresql-*
+
+## @param cmpdVersionPrefix for each ComponentDefinition resources name created by this chart, that can avoid name conflict
+## If specified, the component definition will use it as prefix.
+cmpdVersionPrefix:
+  vanillaPostgresql12: "vanilla-postgresql-12"
+  vanillaPostgresql14: "vanilla-postgresql-14"
+
+## @param componentServiceVersion define default serviceVersion of each Component
+componentServiceVersion:
+  vanillaPostgresql12: 12.15.0
+  vanillaPostgresql14: 14.7.0
+
 shmVolume:
   ## @param shmVolume.enabled Enable emptyDir volume for /dev/shm for PostgreSQL pod(s)
   ##
@@ -60,8 +62,3 @@ shmVolume:
   ## sizeLimit: 1Gi
   ##
   sizeLimit: ""
-
-roleProbe:
-  failureThreshold: 2
-  periodSeconds: 1
-  timeoutSeconds: 1
diff --git a/examples/official-postgresql/README.md b/examples/official-postgresql/README.md
index a2c54e638..45d34e181 100644
--- a/examples/official-postgresql/README.md
+++ b/examples/official-postgresql/README.md
@@ -1,6 +1,6 @@
-# official-postgresql
+# vanilla-postgresql
 
-Official-postgresql is an official PostgreSQL cluster definition Helm chart for Kubernetes
+vanilla-postgresql is a vanilla PostgreSQL cluster definition Helm chart for Kubernetes
 
 ## Prerequisites
 
@@ -24,7 +24,7 @@ helm repo update
 # Install KubeBlocks
 helm install kubeblocks kubeblocks/kubeblocks --namespace kb-system --create-namespace --version="0.9.0"
 ```
-Enable official-postgresql
+Enable vanilla-postgresql
 ```bash
 # Add Helm repo 
 helm repo add kubeblocks-addons https://apecloud.github.io/helm-charts
@@ -33,58 +33,58 @@ helm repo add kubeblocks-addons https://jihulab.com/api/v4/projects/150246/packa
 # Update helm repo
 helm repo update
 
-# Enable official-postgresql 
-helm upgrade -i kb-addon-official-postgresql kubeblocks-addons/official-postgresql --version 0.9.0 -n kb-system  
+# Enable vanilla-postgresql 
+helm upgrade -i kb-addon-vanilla-postgresql kubeblocks-addons/vanilla-postgresql --version 0.9.0 -n kb-system  
 ``` 
 
 ## Examples
 
 ### [Create](cluster.yaml) 
-Create a official-postgresql cluster with specified cluster definition 
+Create a vanilla-postgresql cluster with specified cluster definition 
 ```bash
-kubectl apply -f examples/official-postgresql/cluster.yaml
+kubectl apply -f examples/vanilla-postgresql/cluster.yaml
 ```
 
 ### [Horizontal scaling](horizontalscale.yaml)
 Horizontal scaling out or in specified components replicas in the cluster
 ```bash
-kubectl apply -f examples/official-postgresql/horizontalscale.yaml
+kubectl apply -f examples/vanilla-postgresql/horizontalscale.yaml
 ```
 
 ### [Vertical scaling](verticalscale.yaml)
 Vertical scaling up or down specified components requests and limits cpu or memory resource in the cluster
 ```bash
-kubectl apply -f examples/official-postgresql/verticalscale.yaml
+kubectl apply -f examples/vanilla-postgresql/verticalscale.yaml
 ```
 
 ### [Expand volume](volumeexpand.yaml)
 Increase size of volume storage with the specified components in the cluster
 ```bash
-kubectl apply -f examples/official-postgresql/volumeexpand.yaml
+kubectl apply -f examples/vanilla-postgresql/volumeexpand.yaml
 ```
 
 ### [Restart](restart.yaml)
 Restart the specified components in the cluster
 ```bash
-kubectl apply -f examples/official-postgresql/restart.yaml
+kubectl apply -f examples/vanilla-postgresql/restart.yaml
 ```
 
 ### [Stop](stop.yaml)
 Stop the cluster and release all the pods of the cluster, but the storage will be reserved
 ```bash
-kubectl apply -f examples/official-postgresql/stop.yaml
+kubectl apply -f examples/vanilla-postgresql/stop.yaml
 ```
 
 ### [Start](start.yaml)
 Start the stopped cluster
 ```bash
-kubectl apply -f examples/official-postgresql/start.yaml
+kubectl apply -f examples/vanilla-postgresql/start.yaml
 ```
 
 ### Delete
 If you want to delete the cluster and all its resource, you can modify the termination policy and then delete the cluster
 ```bash
-kubectl patch cluster offpg-cluster -p '{"spec":{"terminationPolicy":"WipeOut"}}' --type="merge"
+kubectl patch cluster vanpg-cluster -p '{"spec":{"terminationPolicy":"WipeOut"}}' --type="merge"
 
-kubectl delete cluster offpg-cluster
+kubectl delete cluster vanpg-cluster
 ```
diff --git a/examples/official-postgresql/cluster.yaml b/examples/official-postgresql/cluster.yaml
index c20a8ad3e..c87531c79 100644
--- a/examples/official-postgresql/cluster.yaml
+++ b/examples/official-postgresql/cluster.yaml
@@ -1,13 +1,13 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: Cluster
 metadata:
-  name: offpg-cluster
+  name: vanpg-cluster
   namespace: default
 spec:
   # Specifies the name of the ClusterDefinition to use when creating a Cluster.
-  clusterDefinitionRef: official-postgresql
+  clusterDefinitionRef: vanilla-postgresql
   # Refers to the ClusterVersion name. Deprecated since v0.9, use ComponentVersion instead. This field is maintained for backward compatibility and its use is discouraged. Existing usage should be updated to the current preferred approach to avoid compatibility issues in future releases.
-  clusterVersionRef: official-postgresql-12.15
+  clusterVersionRef: vanilla-postgresql-12.15
   # Specifies the behavior when a Cluster is deleted.
   # - `DoNotTerminate`: Prevents deletion of the Cluster. This policy ensures that all resources remain intact.
   # - `Halt`: Deletes Cluster resources like Pods and Services but retains Persistent Volume Claims (PVCs), allowing for data preservation while stopping other operations.
@@ -36,8 +36,8 @@ spec:
   # ClusterComponentSpec defines the specifications for a Component in a Cluster.
   componentSpecs:
   - name: postgresql
-    componentDefRef: postgresql
-    serviceAccountName: kb-offpg-cluster
+    componentDef: vanilla-postgresql
+    serviceAccountName: kb-vanpg-cluster
     replicas: 2
     resources:
       limits:
diff --git a/examples/official-postgresql/horizontalscale.yaml b/examples/official-postgresql/horizontalscale.yaml
index 446e36e6f..9fd2b8f74 100644
--- a/examples/official-postgresql/horizontalscale.yaml
+++ b/examples/official-postgresql/horizontalscale.yaml
@@ -1,11 +1,11 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: OpsRequest
 metadata:
-  name: offpg-horizontalscaling
+  name: vanpg-horizontalscaling
   namespace: default
 spec:
   # Specifies the name of the Cluster resource that this operation is targeting.
-  clusterName: offpg-cluster
+  clusterName: vanpg-cluster
   type: HorizontalScaling
   # Lists HorizontalScaling objects, each specifying scaling requirements for a Component, including desired total replica counts, configurations for new instances, modifications for existing instances, and instance downscaling options
   horizontalScaling:
diff --git a/examples/official-postgresql/restart.yaml b/examples/official-postgresql/restart.yaml
index b2bcd6195..d57acbaab 100644
--- a/examples/official-postgresql/restart.yaml
+++ b/examples/official-postgresql/restart.yaml
@@ -1,11 +1,11 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: OpsRequest
 metadata:
-  name: offpg-restart
+  name: vanpg-restart
   namespace: default
 spec:
   # Specifies the name of the Cluster resource that this operation is targeting.
-  clusterName: offpg-cluster
+  clusterName: vanpg-cluster
   type: Restart
   # Lists Components to be restarted. ComponentOps specifies the Component to be operated on.
   restart:
diff --git a/examples/official-postgresql/start.yaml b/examples/official-postgresql/start.yaml
index 420ede504..a7f1eb35a 100644
--- a/examples/official-postgresql/start.yaml
+++ b/examples/official-postgresql/start.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: OpsRequest
 metadata:
-  name: offpg-start
+  name: vanpg-start
   namespace: default
 spec:
   # Specifies the name of the Cluster resource that this operation is targeting.
-  clusterName: offpg-cluster
+  clusterName: vanpg-cluster
   type: Start
diff --git a/examples/official-postgresql/stop.yaml b/examples/official-postgresql/stop.yaml
index 1a6d9e2ad..ef0c07ce8 100644
--- a/examples/official-postgresql/stop.yaml
+++ b/examples/official-postgresql/stop.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: OpsRequest
 metadata:
-  name: offpg-stop
+  name: vanpg-stop
   namespace: default
 spec:
   # Specifies the name of the Cluster resource that this operation is targeting.
-  clusterName: offpg-cluster
+  clusterName: vanpg-cluster
   type: Stop
diff --git a/examples/official-postgresql/verticalscale.yaml b/examples/official-postgresql/verticalscale.yaml
index 4e4f343a2..c16356525 100644
--- a/examples/official-postgresql/verticalscale.yaml
+++ b/examples/official-postgresql/verticalscale.yaml
@@ -1,11 +1,11 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: OpsRequest
 metadata:
-  name: offpg-verticalscaling
+  name: vanpg-verticalscaling
   namespace: default
 spec:
   # Specifies the name of the Cluster resource that this operation is targeting.
-  clusterName: offpg-cluster
+  clusterName: vanpg-cluster
   type: VerticalScaling
   # Lists VerticalScaling objects, each specifying a component and its desired compute resources for vertical scaling. 
   verticalScaling:
diff --git a/examples/official-postgresql/volumeexpand.yaml b/examples/official-postgresql/volumeexpand.yaml
index 362dc0172..daa1dc78c 100644
--- a/examples/official-postgresql/volumeexpand.yaml
+++ b/examples/official-postgresql/volumeexpand.yaml
@@ -1,11 +1,11 @@
 apiVersion: apps.kubeblocks.io/v1alpha1
 kind: OpsRequest
 metadata:
-  name: offpg-volumeexpansion
+  name: vanpg-volumeexpansion
   namespace: default
 spec:
   # Specifies the name of the Cluster resource that this operation is targeting.
-  clusterName: offpg-cluster
+  clusterName: vanpg-cluster
   type: VolumeExpansion
   # Lists VolumeExpansion objects, each specifying a component and its corresponding volumeClaimTemplates that requires storage expansion. 
   volumeExpansion: