Skip to content

Commit

Permalink
fix(Cadence): fixed legacy clusterMetadata default
Browse files Browse the repository at this point in the history
It was broken since chart 0.18.0.

.Values.server.frontend.service.port is required
for the Cadence K8s service in the Helm chart,
thus it will always be defined, so I changed the
defaulting behavior to always use that, because it
would never fall back to the dockerize env var
.Env.FRONTEND_PORT or even back to literal 7933.
  • Loading branch information
pregnor committed Aug 2, 2021
1 parent d4c77e5 commit 3ab6710
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions cadence/templates/server-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,13 @@ data:
enableGlobalDomain: {{ `{{ default .Env.ENABLE_GLOBAL_DOMAIN "true" }}` }}
failoverVersionIncrement: 10
masterClusterName: "primary"
{{- if `{{ .Env.IS_NOT_PRIMARY }}` }}
currentClusterName: "secondary"
{{- else }}
currentClusterName: "primary"
{{- end }}
clusterInformation:
primary:
enabled: true
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: {{ `{{ default .Env.PRIMARY_FRONTEND_SERVICE "cadence" }}` }}:{{ .Values.server.frontend.service.port | default `{{ default .Env.FRONTEND_PORT 7933 }}` }}
{{- if `{{ .Env.ENABLE_GLOBAL_DOMAIN }}` }}
secondary:
enabled: true
initialFailoverVersion: 2
rpcName: "cadence-frontend"
rpcAddress: {{ `{{ default .Env.SECONDARY_FRONTEND_SERVICE "cadence-secondary" }}` }}:{{ .Values.server.frontend.service.port | default `{{ default .Env.FRONTEND_PORT 7933 }}` }}
{{- end }}
rpcAddress: {{ `{{ default .Env.PRIMARY_FRONTEND_SERVICE "cadence" }}` }}:{{ .Values.server.frontend.service.port }}
{{- end }}
dcRedirectionPolicy:
Expand Down

0 comments on commit 3ab6710

Please sign in to comment.