chore: refactor roles (#1428)

(cherry picked from commit 1145cd8)
apecloud · Jan 23, 2025 · f5f7cd0 · f5f7cd0
1 parent 5e35ed2
commit f5f7cd0
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 106 deletions.
diff --git a/addons/apecloud-mysql/templates/_helpers.tpl b/addons/apecloud-mysql/templates/_helpers.tpl
@@ -133,17 +133,14 @@ tls:
   keyFile: key.pem
 roles:
   - name: leader
-    serviceable: true
-    writable: true
-    votable: true
+    updatePriority: 3
+    participatesInQuorum: true
   - name: follower
-    serviceable: true
-    writable: false
-    votable: true
+    updatePriority: 2
+    participatesInQuorum: true
   - name: learner
-    serviceable: false
-    writable: false
-    votable: false
+    updatePriority: 1
+    participatesInQuorum: false
 lifecycleActions:
   roleProbe:
     periodSeconds: {{ .Values.roleProbe.periodSeconds }}

diff --git a/addons/apecloud-postgresql/templates/_helpers.tpl b/addons/apecloud-postgresql/templates/_helpers.tpl
@@ -149,17 +149,14 @@ volumes:
     needSnapshot: false
 roles:
   - name: leader
-    serviceable: true
-    writable: true
-    votable: true
+    updatePriority: 3
+    participatesInQuorum: true
   - name: follower
-    serviceable: true
-    writable: false
-    votable: true
+    updatePriority: 2
+    participatesInQuorum: true
   - name: learner
-    serviceable: false
-    writable: false
-    votable: false
+    updatePriority: 1
+    participatesInQuorum: false
 vars:
   ## the postgres leader pod name which is dynamically selected, caution to use it
   - name: POSTGRES_LEADER_POD_NAME

diff --git a/addons/etcd/templates/cmpd.yaml b/addons/etcd/templates/cmpd.yaml
@@ -126,13 +126,11 @@ spec:
   updateStrategy: Serial
   roles:
     - name: leader
-      serviceable: true
-      writable: true
-      votable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: follower
-      serviceable: true
-      writable: false
-      votable: true
+      updatePriority: 1
+      participatesInQuorum: true
   lifecycleActions:
     roleProbe:
       exec:

diff --git a/addons/minio/templates/cmpd.yaml b/addons/minio/templates/cmpd.yaml
@@ -85,9 +85,8 @@ spec:
 
   roles:
     - name: readwrite
-      serviceable: true
-      votable: false
-      writable: true
+      updatePriority: 1
+      participatesInQuorum: false
 
   lifecycleActions:
     roleProbe:

diff --git a/addons/mogdb/templates/cmpd.yaml b/addons/mogdb/templates/cmpd.yaml
@@ -46,11 +46,11 @@ spec:
     {{- end }}
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   systemAccounts:
     - name: root
       initAccount: true

diff --git a/addons/mongodb/templates/componentdefinition.yaml b/addons/mongodb/templates/componentdefinition.yaml
@@ -64,13 +64,11 @@ spec:
         letterCase: MixedCases
   roles:
     - name: primary
-      serviceable: true
-      writable: true
-      votable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: secondary
-      serviceable: true
-      writable: false
-      votable: true
+      updatePriority: 1
+      participatesInQuorum: true
   lifecycleActions:
     roleProbe:
       periodSeconds: {{ .Values.roleProbe.periodSeconds }}

diff --git a/addons/mysql/templates/_helpers.tpl b/addons/mysql/templates/_helpers.tpl
@@ -213,11 +213,11 @@ lifecycleActions:
           /tools/syncerctl switchover --primary "$KB_LEADER_POD_NAME" ${KB_SWITCHOVER_CANDIDATE_NAME:+--candidate "$KB_SWITCHOVER_CANDIDATE_NAME"}
 roles:
   - name: primary
-    serviceable: true
-    writable: true
+    updatePriority: 2
+    participatesInQuorum: false
   - name: secondary
-    serviceable: true
-    writable: false
+    updatePriority: 1
+    participatesInQuorum: false
 {{- end }}
 
 {{- define "mysql.spec.runtime.common" -}}
@@ -281,11 +281,11 @@ systemAccounts:
     statement: CREATE USER IF NOT EXISTS '${KB_ACCOUNT_NAME}' IDENTIFIED BY '${KB_ACCOUNT_PASSWORD}'; GRANT SELECT ON performance_schema.* TO '${KB_ACCOUNT_NAME}'; GRANT SELECT ON sys.* TO '${KB_ACCOUNT_NAME}';
 roles:
   - name: primary
-    serviceable: true
-    writable: true
+    updatePriority: 2
+    participatesInQuorum: false
   - name: secondary
-    serviceable: true
-    writable: false
+    updatePriority: 1
+    participatesInQuorum: false
 vars:
   - name: ORC_TOPOLOGY_USER
     valueFrom:

diff --git a/addons/orchestrator/templates/cmpd-raft.yaml b/addons/orchestrator/templates/cmpd-raft.yaml
@@ -10,13 +10,11 @@ spec:
   {{- include "orchestrator.cmpd.spec.common" . | nindent 2 }}
   roles:
     - name: primary
-      serviceable: true
-      writable: true
-      votable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: secondary
-      serviceable: true
-      writable: false
-      votable: true
+      updatePriority: 1
+      participatesInQuorum: true
   vars:
     - name: ORC_META_DATABASE
       value: orchestrator

diff --git a/addons/polardbx/templates/cmpd-dn.yaml b/addons/polardbx/templates/cmpd-dn.yaml
@@ -27,13 +27,11 @@ spec:
   updateStrategy: Serial
   roles:
     - name: leader
-      serviceable: true
-      writable: true
-      votable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: follower
-      serviceable: true
-      writable: false
-      votable: true
+      updatePriority: 1
+      participatesInQuorum: true
   volumes:
     - name: data
   vars:

diff --git a/addons/polardbx/templates/cmpd-gms.yaml b/addons/polardbx/templates/cmpd-gms.yaml
@@ -38,13 +38,11 @@ spec:
   updateStrategy: Serial
   roles:
     - name: leader
-      serviceable: true
-      writable: true
-      votable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: follower
-      serviceable: true
-      writable: false
-      votable: true
+      updatePriority: 1
+      participatesInQuorum: true
   volumes:
     - name: data
   vars:

diff --git a/addons/postgresql/templates/componentdefinition-12.yaml b/addons/postgresql/templates/componentdefinition-12.yaml
@@ -35,11 +35,11 @@ spec:
       needSnapshot: true
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   logConfigs:
     {{- range $name,$pattern := .Values.logConfigs }}
     - name: {{ $name }}

diff --git a/addons/postgresql/templates/componentdefinition-14.yaml b/addons/postgresql/templates/componentdefinition-14.yaml
@@ -35,11 +35,11 @@ spec:
       needSnapshot: true
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   logConfigs:
     {{- range $name,$pattern := .Values.logConfigs }}
     - name: {{ $name }}

diff --git a/addons/postgresql/templates/componentdefinition-15.yaml b/addons/postgresql/templates/componentdefinition-15.yaml
@@ -35,11 +35,11 @@ spec:
       needSnapshot: true
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   logConfigs:
     {{- range $name,$pattern := .Values.logConfigs }}
     - name: {{ $name }}

diff --git a/addons/postgresql/templates/componentdefinition-16.yaml b/addons/postgresql/templates/componentdefinition-16.yaml
@@ -35,11 +35,11 @@ spec:
       needSnapshot: true
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   logConfigs:
     {{- range $name,$pattern := .Values.logConfigs }}
     - name: {{ $name }}

diff --git a/addons/redis/templates/cmpd-redis-7.yaml b/addons/redis/templates/cmpd-redis-7.yaml
@@ -37,11 +37,11 @@ spec:
       needSnapshot: true
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   logConfigs:
     {{- range $name,$pattern := .Values.logConfigs }}
     - name: {{ $name }}

diff --git a/addons/redis/templates/cmpd-redis-cluster-7.yaml b/addons/redis/templates/cmpd-redis-cluster-7.yaml
@@ -33,11 +33,11 @@ spec:
       needSnapshot: true
   roles:
     - name: primary
-      serviceable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: false
     - name: secondary
-      serviceable: false
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: false
   logConfigs:
     {{- range $name,$pattern := .Values.logConfigs }}
     - name: {{ $name }}

diff --git a/addons/tidb/templates/componentdefinition-pd.yaml b/addons/tidb/templates/componentdefinition-pd.yaml
@@ -64,13 +64,11 @@ spec:
       volumeName: config
   roles:
     - name: leader
-      serviceable: true
-      votable: true
-      writable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: follower
-      serviceable: true
-      votable: true
-      writable: false
+      updatePriority: 1
+      participatesInQuorum: true
   lifecycleActions:
     roleProbe:
       exec:

diff --git a/addons/vanilla-postgresql/templates/_helpers.tpl b/addons/vanilla-postgresql/templates/_helpers.tpl
@@ -254,11 +254,11 @@ services:
     roleSelector: primary
 roles:
   - name: primary
-    serviceable: true
-    writable: true
+    updatePriority: 2
+    participatesInQuorum: false
   - name: secondary
-    serviceable: true
-    writable: false
+    updatePriority: 1
+    participatesInQuorum: false
 volumes:
   - name: data
     needSnapshot: true

diff --git a/addons/zookeeper/templates/cmpd.yaml b/addons/zookeeper/templates/cmpd.yaml
@@ -33,17 +33,14 @@ spec:
             port: 8080
   roles:
     - name: leader
-      serviceable: true
-      writable: true
-      votable: true
+      updatePriority: 3
+      participatesInQuorum: true
     - name: follower
-      serviceable: true
-      writable: false
-      votable: true
+      updatePriority: 2
+      participatesInQuorum: true
     - name: observer
-      serviceable: false
-      writable: false
-      votable: false
+      updatePriority: 1
+      participatesInQuorum: false
   updateStrategy: BestEffortParallel
   vars:
     - name: ZOOKEEPER_POD_FQDN_LIST