Merge branch 'main' into support/kafka-v1.0-upgrade

apecloud · Oct 24, 2024 · 65d420e · 65d420e
2 parents 633c3e1 + cfe6878
commit 65d420e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/addons-cluster/apecloud-postgresql/templates/cluster.yaml b/addons-cluster/apecloud-postgresql/templates/cluster.yaml
@@ -6,12 +6,11 @@ metadata:
   labels: {{ include "kblib.clusterLabels" . | nindent 4 }}
 spec:
   terminationPolicy: {{ .Values.extra.terminationPolicy }}
-  {{- include "kblib.affinity" . | indent 2 }}
   clusterDef: apecloud-postgresql
   topology: apecloud-postgresql
   componentSpecs:
     - name: postgresql
-      componentDef: postgresql
+      componentDef: apecloud-postgresql14
       {{- include "kblib.componentMonitor" . | indent 6 }}
       replicas: {{ include "apecloud-postgresql-cluster.replicas" . }}
       serviceAccountName: {{ include "kblib.serviceAccountName" . }}
diff --git a/addons/apecloud-postgresql/templates/clusterdefinition.yaml b/addons/apecloud-postgresql/templates/clusterdefinition.yaml
@@ -6,12 +6,8 @@ metadata:
     {{- include "apecloud-postgresql.labels" . | nindent 4 }}
 spec:
   topologies:
-    - name: standalone
+    - name: apecloud-postgresql
       components:
         - name: postgresql
           compDef: {{ include "apecloud-postgresql.compDefApecloudPostgresql14" . }}
       default: true
-    - name: raftGroup
-      components:
-        - name: postgresql
-          compDef: {{ include "apecloud-postgresql.compDefApecloudPostgresql14" . }}
diff --git a/addons/apecloud-postgresql/templates/cmpd-apepg.yaml b/addons/apecloud-postgresql/templates/cmpd-apepg.yaml
@@ -130,7 +130,7 @@ spec:
       - command:
           - sh
           - -c
-          - cp -r /bin/syncer /config /tools/
+          - cp -r /bin/syncer /tools/
         image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }}
         imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
         name: init-syncer
@@ -152,8 +152,6 @@ spec:
     containers:
       - command:
           - /tools/syncer
-          - --config-path
-          - /tools/config/components
           - --port
           - '3601'
           - --
@@ -172,10 +170,6 @@ spec:
               fieldRef:
                 apiVersion: v1
                 fieldPath: metadata.namespace
-          - name: POSTGRES_USER
-            value: $(POSTGRES_USER)
-          - name: POSTGRES_PASSWORD
-            value: $(POSTGRES_PASSWORD)
           - name: PGUSER
             value: $(POSTGRES_USER)
           - name: PGPASSWORD
@@ -186,6 +180,8 @@ spec:
             value: {{ .Values.dataPath }}
           - name: PGCONF
             value: {{ .Values.confPath }}
+          - name: KB_SERVICE_CHARACTER_TYPE
+            value: apecloud-postgresql
           - name: POSTGRESQL_MOUNTED_CONF_DIR
             value: {{ .Values.confMountPath }}
         image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}

diff --git a/addons/apecloud-postgresql/values.yaml b/addons/apecloud-postgresql/values.yaml
@@ -12,7 +12,7 @@ image:
   debug: false
   syncer:
     repository: apecloud/syncer
-    tag: "0.2.0"
+    tag: "0.3.2"
 
   # refer: https://github.com/apecloud/dbctl/blob/main/docker/Dockerfile
   dbctl:

diff --git a/hack/get-addons.sh b/hack/get-addons.sh
@@ -15,7 +15,7 @@ for d in $(find ./addons -type d  -not -name "common" -not -name "kblib" -not -n
     dir_name=$(basename $d)
 
     helm dependency build addons/$dir_name --skip-refresh > /dev/null 2>&1
-    helm template addon addons/$dir_name > /tmp/rendered.yaml
+    helm template addon addons/$dir_name --dependency-update > /tmp/rendered.yaml
 
     # prase from ComponentVersion
     version_lines=$(cat "/tmp/rendered.yaml" | yq e '. | select(.kind == "ComponentVersion")'  | yq '.metadata.name + "-" +.spec.releases[].serviceVersion' -N | sort | uniq)