fix

apecloud · Oct 9, 2024 · 5ae51ee · 5ae51ee
1 parent 567a44d
commit 5ae51ee
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/addons-cluster/vanilla-postgresql/values.yaml b/addons-cluster/vanilla-postgresql/values.yaml
@@ -4,7 +4,7 @@
 
 ## @param version Postgresql cluster version
 ##
-version: "14.7"
+version: 14.7.0
 
 ## @param mode postgresql cluster topology mode, standalone, replication
 ##

diff --git a/addons/vanilla-postgresql/templates/_helpers.tpl b/addons/vanilla-postgresql/templates/_helpers.tpl
@@ -280,4 +280,7 @@ env:
     value: $(POSTGRES_USER)
   - name: PGPASSWORD
     value: $(POSTGRES_PASSWORD)
+  # fixme: only used for lorry in 0.9
+  - name: KB_SERVICE_CHARACTER_TYPE
+    value: postgresql
 {{- end -}}
diff --git a/addons/vanilla-postgresql/templates/clusterdefinition.yaml b/addons/vanilla-postgresql/templates/clusterdefinition.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps.kubeblocks.io/v1
+apiVersion: apps.kubeblocks.io/v1alpha1
 kind: ClusterDefinition
 metadata:
   name: {{ include "vanilla-postgresql.clusterDefinition" . }}

diff --git a/addons/vanilla-postgresql/templates/cmpd-12.yaml b/addons/vanilla-postgresql/templates/cmpd-12.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps.kubeblocks.io/v1
+apiVersion: apps.kubeblocks.io/v1alpha1
 kind: ComponentDefinition
 metadata:
   name: {{ include "vanilla-postgresql12.compDefName" . }}

diff --git a/addons/vanilla-postgresql/templates/cmpd-14.yaml b/addons/vanilla-postgresql/templates/cmpd-14.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps.kubeblocks.io/v1
+apiVersion: apps.kubeblocks.io/v1alpha1
 kind: ComponentDefinition
 metadata:
   name: {{ include "vanilla-postgresql14.compDefName" . }}

diff --git a/addons/vanilla-postgresql/templates/cmpv.yaml b/addons/vanilla-postgresql/templates/cmpv.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps.kubeblocks.io/v1
+apiVersion: apps.kubeblocks.io/v1alpha1
 kind: ComponentVersion
 metadata:
   name: {{ include "vanilla-postgresql.componentVersion" . }}
@@ -9,19 +9,19 @@ spec:
     - compDefs:
         - {{ include "vanilla-postgresql12.componentDefNamePrefix" . }}
       releases:
-        - 12.15
+        - 12.15.0
     - compDefs:
         - {{ include "vanilla-postgresql14.componentDefNamePrefix" . }}
       releases:
-        - 14.7
+        - 14.7.0
   releases:
-    - name: 12.15
+    - name: 12.15.0
       changes:
-      serviceVersion: 12.15 # {{ .Values.componentServiceVersion.vanillaPostgresql12  }}
+      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
+    - name: 14.7.0
       changes:
-      serviceVersion: 14.7
+      serviceVersion: 14.7.0
       images:
         postgresql: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tags.major14.minor07 }}
diff --git a/addons/vanilla-postgresql/values.yaml b/addons/vanilla-postgresql/values.yaml
@@ -50,8 +50,8 @@ cmpdVersionPrefix:
 
 ## @param componentServiceVersion define default serviceVersion of each Component
 componentServiceVersion:
-  vanillaPostgresql12: "12.15"
-  vanillaPostgresql14: "14.7"
+  vanillaPostgresql12: 12.15.0
+  vanillaPostgresql14: 14.7.0
 
 shmVolume:
   ## @param shmVolume.enabled Enable emptyDir volume for /dev/shm for PostgreSQL pod(s)