chore: set redis cluster advertised service value to required (#826)

(cherry picked from commit 6588241)
apecloud · Jul 18, 2024 · bd3e5da · bd3e5da
1 parent 2be56ba
commit bd3e5da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/addons/redis/templates/componentdefinition-redis-cluster.yaml b/addons/redis/templates/componentdefinition-redis-cluster.yaml
@@ -93,7 +93,7 @@ spec:
           optional: true
           port:
             name: redis-advertised
-            option: Optional
+            option: Required
     ## the redis cluster advertised service bus port list for each pod of current shard, the value format is "pod1Svc:nodeport1,pod2Svc:nodeport2,..."
     - name: REDIS_CLUSTER_ADVERTISED_BUS_PORT
       valueFrom:
@@ -103,15 +103,15 @@ spec:
           optional: true
           port:
             name: advertised-bus
-            option: Optional
+            option: Required
     ## the redis cluster advertised service name list for each pod of current shard, the value format is "pod1Svc,pod2Svc,..."
     - name: REDIS_CLUSTER_ADVERTISED_SVC_NAME
       valueFrom:
         serviceVarRef:
           compDef: {{ include "redis-cluster.componentDefName" . }}
           name: redis-advertised
           optional: true
-          host: Optional
+          host: Required
     ## the redis cluster advertised service port list for each pod of all shard pods
     ## the value format is like "shard-98x@redis-shard-98x-redis-advertised-0:32024,redis-shard-98x-redis-advertised-1:31318.shard-cq7@redis-shard-cq7-redis-advertised-0:31828,redis-shard-cq7-redis-advertised-1:32000"
     - name: REDIS_CLUSTER_ALL_SHARDS_ADVERTISED_PORT
@@ -128,7 +128,7 @@ spec:
                 keyValueDelimiter: "@"
           port:
             name: redis-advertised
-            option: Optional
+            option: Required
     ## the redis cluster advertised service bus port list for each pod of all shard pods
     ## the value format is like "shard-98x@redis-shard-98x-redis-advertised-0:30654,redis-shard-98x-redis-advertised-1:30971.shard-cq7@redis-shard-cq7-redis-advertised-0:32555,redis-shard-cq7-redis-advertised-1:32368"
     - name: REDIS_CLUSTER_ALL_SHARDS_ADVERTISED_BUS_PORT
@@ -145,7 +145,7 @@ spec:
                 keyValueDelimiter: "@"
           port:
             name: advertised-bus
-            option: Optional
+            option: Required
     ## the redis cluster advertised service name list for each pod of all shard pods.
     ## the value format is like "shard-98x@redis-shard-98x-redis-advertised-0,redis-shard-98x-redis-advertised-1.shard-cq7@redis-shard-cq7-redis-advertised-0,redis-shard-cq7-redis-advertised-1"
     - name: REDIS_CLUSTER_ALL_SHARDS_ADVERTISED_SVC_NAME
@@ -160,7 +160,7 @@ spec:
               flattenFormat:
                 delimiter: "."
                 keyValueDelimiter: "@"
-          host: Optional
+          host: Required
   lifecycleActions:
     roleProbe:
       builtinHandler: redis

diff --git a/addons/redis/templates/componentdefinition-redis.yaml b/addons/redis/templates/componentdefinition-redis.yaml
@@ -99,15 +99,15 @@ spec:
           optional: true
           port:
             name: redis-advertised
-            option: Optional
+            option: Required
     ## the redis advertised service name list for each pod, the value format is "pod1Svc,pod2Svc,..."
     - name: REDIS_ADVERTISED_SVC_NAME
       valueFrom:
         serviceVarRef:
           compDef: {{ include "redis.componentDefName" . }}
           name: redis-advertised
           optional: true
-          host: Optional
+          host: Required
     ## the username of redis sentinel for redis connection, it is optional
     - name: SENTINEL_USER
       valueFrom: