Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions addons/redis/templates/componentdefinition-redis-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -160,7 +160,7 @@ spec:
flattenFormat:
delimiter: "."
keyValueDelimiter: "@"
host: Optional
host: Required
lifecycleActions:
roleProbe:
builtinHandler: redis
Expand Down
4 changes: 2 additions & 2 deletions addons/redis/templates/componentdefinition-redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading