merge(#1281): fix Cadence clusterMetadata defaults

Backported Cadence clusterMetadata default values fix to 0.19 #1281
banzaicloud · Aug 2, 2021 · bb449d3 · bb449d3
2 parents 4122ffa + 5a1a778
commit bb449d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/cadence/Chart.yaml b/cadence/Chart.yaml
@@ -1,5 +1,5 @@
 name: cadence
-version: 0.19.0
+version: 0.19.1
 appVersion: 0.20.0
 description: Cadence is a distributed, scalable, durable, and highly available orchestration engine to execute asynchronous long-running business logic in a scalable and resilient way.
 icon: https://raw.githubusercontent.com/uber/cadence-web/master/client/assets/logo.svg

diff --git a/cadence/templates/server-configmap.yaml b/cadence/templates/server-configmap.yaml
@@ -148,24 +148,13 @@ data:
       enableGlobalDomain: {{ `{{ default .Env.ENABLE_GLOBAL_DOMAIN "false" }}` }}
       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_SEEDS "cadence" }}` }}:7933
-      {{- if `{{ .Env.ENABLE_GLOBAL_DOMAIN }}` }}
-        secondary:
-            enabled: true
-            initialFailoverVersion: 2
-            rpcName: "cadence-frontend"
-            rpcAddress: {{ `{{ default .Env.SECONDARY_SEEDS "cadence-secondary" }}` }}:7933
-      {{- end }}
 
     dcRedirectionPolicy:
       policy: {{ `{{ default .Env.DC_REDIRECT_POLICY "selected-apis-forwarding" }}` }}