chore: apecloud mysql support rerender after vscale (#834)

apecloud · Sep 2, 2024 · 07d9753 · 07d9753
1 parent a3c61c6
commit 07d9753
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 7 deletions.
diff --git a/addons/apecloud-mysql/templates/clusterdefinition.yaml b/addons/apecloud-mysql/templates/clusterdefinition.yaml
@@ -31,6 +31,8 @@ spec:
           constraintRef: {{ include "apecloud-mysql.configConstraintName" . }}
           volumeName: mysql-config
           namespace: {{ .Release.Namespace }}
+          reRenderResourceTypes:
+            - vscale
         - name: vttablet-config
           templateRef: {{ include "apecloud-mysql.configTplVttabletName" . }}
           constraintRef: {{ include "apecloud-mysql.configConstraintVttabletName" . }}

diff --git a/addons/postgresql/templates/componentdefinition-12.yaml b/addons/postgresql/templates/componentdefinition-12.yaml
@@ -50,7 +50,9 @@ spec:
         - postgresql.conf
       namespace: {{ .Release.Namespace }}
       volumeName: postgresql-config
-      defaultMode: 0777
+      defaultMode: 0444
+      reRenderResourceTypes:
+        - vscale
     - name: pgbouncer-configuration
       templateRef: pgbouncer-configuration
       keys:
@@ -344,4 +346,4 @@ spec:
           compDef: postgresql-12
           name: postgres
           optional: false
-          password: Required
+          password: Required
diff --git a/addons/postgresql/templates/componentdefinition-14.yaml b/addons/postgresql/templates/componentdefinition-14.yaml
@@ -50,7 +50,9 @@ spec:
         - postgresql.conf
       namespace: {{ .Release.Namespace }}
       volumeName: postgresql-config
-      defaultMode: 0777
+      defaultMode: 0444
+      reRenderResourceTypes:
+        - vscale
     - name: pgbouncer-configuration
       templateRef: pgbouncer-configuration
       keys:
@@ -344,4 +346,4 @@ spec:
           compDef: postgresql-14
           name: postgres
           optional: false
-          password: Required
+          password: Required
diff --git a/addons/postgresql/templates/componentdefinition-15.yaml b/addons/postgresql/templates/componentdefinition-15.yaml
@@ -50,7 +50,9 @@ spec:
         - postgresql.conf
       namespace: {{ .Release.Namespace }}
       volumeName: postgresql-config
-      defaultMode: 0777
+      defaultMode: 0444
+      reRenderResourceTypes:
+        - vscale
     - name: pgbouncer-configuration
       templateRef: pgbouncer-configuration
       keys:
@@ -344,4 +346,4 @@ spec:
           compDef: postgresql-15
           name: postgres
           optional: false
-          password: Required
+          password: Required
diff --git a/addons/postgresql/templates/componentdefinition-16.yaml b/addons/postgresql/templates/componentdefinition-16.yaml
@@ -50,7 +50,9 @@ spec:
         - postgresql.conf
       namespace: {{ .Release.Namespace }}
       volumeName: postgresql-config
-      defaultMode: 0777
+      defaultMode: 0444
+      reRenderResourceTypes:
+        - vscale
     - name: pgbouncer-configuration
       templateRef: pgbouncer-configuration
       keys:

diff --git a/addons/pulsar/templates/componentdef-bkrecovery.yaml b/addons/pulsar/templates/componentdef-bkrecovery.yaml
@@ -27,6 +27,8 @@ spec:
         - bookies-recovery
         - check-bookies
       volumeName: recovery-config-env
+      reRenderResourceTypes:
+        - vscale
   scripts:
     - name: pulsar-scripts
       templateRef: {{ include "pulsar.name" . }}-scripts

diff --git a/addons/pulsar/templates/componentdef-bookkeeper.yaml b/addons/pulsar/templates/componentdef-bookkeeper.yaml
@@ -27,11 +27,15 @@ spec:
       injectEnvTo:
         - init-bookies
         - bookies
+      reRenderResourceTypes:
+        - vscale
     - name: bookies-config
       templateRef: {{ include "pulsar.name" . }}{{include "pulsar.major.version" .}}-bookies-config-tpl
       namespace: {{ .Release.Namespace }}
       volumeName: pulsar-bookies-config
       constraintRef: pulsar{{include "pulsar.major.version" .}}-bookies-cc
+      reRenderResourceTypes:
+        - vscale
   scripts:
     - name: pulsar-scripts
       templateRef: {{ include "pulsar.name" . }}-scripts

diff --git a/addons/pulsar/templates/componentdef-broker.yaml b/addons/pulsar/templates/componentdef-broker.yaml
@@ -61,6 +61,8 @@ spec:
         - broker
         - init-pulsar-client-config
       volumeName: broker-env
+      reRenderResourceTypes:
+        - vscale
     - name: broker-config
       templateRef: {{ include "pulsar.name" . }}{{include "pulsar.major.version" .}}-broker-config-tpl
       namespace: {{ .Release.Namespace }}

diff --git a/addons/pulsar/templates/componentdef-proxy.yaml b/addons/pulsar/templates/componentdef-proxy.yaml
@@ -27,6 +27,8 @@ spec:
       injectEnvTo:
         - proxy
         - check-broker
+      reRenderResourceTypes:
+        - vscale
     - name: proxy-config
       templateRef: {{ include "pulsar.name" . }}{{include "pulsar.major.version" .}}-proxy-config-tpl
       namespace: {{ .Release.Namespace }}

diff --git a/addons/redis/templates/componentdefinition-redis-cluster.yaml b/addons/redis/templates/componentdefinition-redis-cluster.yaml
@@ -46,6 +46,8 @@ spec:
       constraintRef: redis-cluster7-config-constraints
       namespace: {{ .Release.Namespace }}
       volumeName: redis-cluster-config
+      reRenderResourceTypes:
+        - vscale
     - name: redis-metrics-config
       templateRef: redis-metrics-config
       namespace: {{ .Release.Namespace }}