Add clusterMetadata to clusterName to easily rename a cluster

charts/temporal/templates/server-configmap.yaml

@@ -104,18 +104,17 @@ data:
           bindOnIP: "0.0.0.0"
 
     clusterMetadata:
-    {{- with $server.config.clusterMetadata }}
+    {{- with (omit $server.config.clusterMetadata "clusterName") }}
       {{- toYaml . | nindent 8 }}
     {{- else }}
       enableGlobalNamespace: false
       failoverVersionIncrement: 10
-      masterClusterName: "active"
-      currentClusterName: "active"
+      masterClusterName: {{ $server.config.clusterMetadata.clusterName | quote }}
+      currentClusterName: {{ $server.config.clusterMetadata.clusterName | quote }}
       clusterInformation:
-        active:
+        {{ $server.config.clusterMetadata.clusterName }}:
           enabled: true
           initialFailoverVersion: 1
-          rpcName: "temporal-frontend"
           rpcAddress: "127.0.0.1:{{ $server.frontend.service.port }}"
           httpAddress: "127.0.0.1:{{ $server.frontend.service.httpPort }}"
     {{- end }}

charts/temporal/tests/server_configmap_test.yaml

@@ -43,6 +43,53 @@ tests:
           path: data['config_template.yaml']
           pattern: 'password: \{\{ env "TEMPORAL_VISIBILITY_STORE_PASSWORD" \| quote \}\}'
 
+  - it: handles clusterMetadata clusterName
+    set:
+      server:
+        config:
+          persistence:
+            defaultStore: default
+            visibilityStore: visibility
+            datastores:
+              default:
+              visibility:
+          clusterMetadata:
+            clusterName: my-cluster
+    template: templates/server-configmap.yaml
+    documentSelector:
+      path: metadata.name
+      value: RELEASE-NAME-temporal-config
+    asserts:
+      - matchRegex:
+          path: data['config_template.yaml']
+          pattern: 'masterClusterName: "my-cluster"\s+currentClusterName: "my-cluster"'
+      - matchRegex:
+          path: data['config_template.yaml']
+          pattern: 'clusterInformation:\s+my-cluster:'
+
+  - it: handles custom clusterMetadata
+    set:
+      server:
+        config:
+          persistence:
+            defaultStore: default
+            visibilityStore: visibility
+            datastores:
+              default:
+              visibility:
+          clusterMetadata:
+            clusterName: my-cluster # this is ignored
+            enableGlobalNamespace: true
+            failoverVersionIncrement: 20
+    template: templates/server-configmap.yaml
+    documentSelector:
+      path: metadata.name
+      value: RELEASE-NAME-temporal-config
+    asserts:
+      - matchRegex:
+          path: data['config_template.yaml']
+          pattern: 'clusterMetadata:\s+enableGlobalNamespace: true\s+failoverVersionIncrement: 20'
+
   - it: handles additional stores
     set:
       server:

charts/temporal/values.yaml

@@ -221,6 +221,10 @@ server:
         #   sql:
         #     pluginName: postgres12
         #     ...
+    clusterMetadata:
+      # Sets the cluster name.
+      # If any other clusterMetadata fields are set, clusterName will be ignored, and those will be set as clusterMetadata instead.
+      clusterName: active
     namespaces:
       # Enable this to create namespaces
       create: false