merge(#1327): Cadence server 0.24.0, web 3.32.0

banzaicloud · Dec 1, 2022 · 76b8f20 · 76b8f20
2 parents 443c7d6 + 030e75c
commit 76b8f20
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/cadence/Chart.yaml b/cadence/Chart.yaml
@@ -1,6 +1,6 @@
 name: cadence
-version: 0.23.1
-appVersion: 0.23.2
+version: 0.24.0
+appVersion: 0.24.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
 apiVersion: v1

diff --git a/cadence/README.md b/cadence/README.md
@@ -19,7 +19,7 @@ This chart bootstraps a [Cadence](https://github.com/uber/cadence) and a [Cadenc
 ## Prerequisites
 
 - Kubernetes 1.7+ with Beta APIs enabled
-- Cadence 0.23.0+
+- Cadence 0.24.0+
 
 
 ## Installing the Chart
@@ -328,7 +328,7 @@ Global options overridable per service are marked with an asterisk.
 | `nameOverride`                                    | Override name of the application                      | ``                    |
 | `fullnameOverride`                                | Override full name of the application                 | ``                    |
 | `server.image.repository`                         | Server image repository                               | `ubercadence/server`  |
-| `server.image.tag`                                | Server image tag                                      | `0.23.2`              |
+| `server.image.tag`                                | Server image tag                                      | `0.24.0`              |
 | `server.image.pullPolicy`                         | Server image pull policy                              | `IfNotPresent`        |
 | `server.replicaCount`*                            | Server replica count                                  | `1`                   |
 | `server.metrics.annotations.enabled`*             | Annotate pods with Prometheus annotations             | `false`               |
@@ -365,7 +365,7 @@ Global options overridable per service are marked with an asterisk.
 | `web.enabled`                                     | Enable WebUI service                                  | `true`                |
 | `web.replicaCount`                                | Number of WebUI service Replicas                      | `1`                   |
 | `web.image.repository`                            | WebUI image repository                                | `ubercadence/web`     |
-| `web.image.tag`                                   | WebUI image tag                                       | `3.29.5`              |
+| `web.image.tag`                                   | WebUI image tag                                       | `3.32.0`              |
 | `web.image.pullPolicy`                            | WebUI image pull policy                               | `IfNotPresent`        |
 | `web.service.annotations`                         | WebUI service annotations                             | `{}`                  |
 | `web.service.type`                                | WebUI service type                                    | `ClusterIP`           |

diff --git a/cadence/templates/server-configmap.yaml b/cadence/templates/server-configmap.yaml
@@ -162,14 +162,19 @@ data:
       {{- $currentClusterName := .Values.server.config.clusterMetadata.currentClusterName }}
       {{- $currentClusterIndex := 0 }}
       {{- $frontendComponentName := (include "cadence.componentname" (list . "frontend")) }}
-      {{- $serverFrontendServicePort := .Values.server.frontend.service.port }}
+      {{- $serverFrontendServiceTransport := .Values.server.frontend.service.transport | default "grpc" }}
+      {{- $serverFrontendServicePort := (.Values.server.frontend.service.grpcPort | int) | default 7833 }}
+      {{- if eq $serverFrontendServiceTransport "tchannel" }}
+        {{- $serverFrontendServicePort = (.Values.server.frontend.service.port | int) }}
+      {{- end }}
       {{- range $clusterIndex, $clusterInfo := .Values.server.config.clusterMetadata.clusterInformation }}
         {{- if eq $clusterInfo.name $currentClusterName }}{{ $currentClusterIndex = $clusterIndex }}{{ end }}
         {{ $clusterInfo.name }}:
           enabled: {{ $clusterInfo.enabled }}
           initialFailoverVersion: {{ $clusterIndex }}
           rpcName: "{{ $frontendComponentName }}"
-          rpcAddress: "{{ $clusterInfo.rpcAddress | default (printf "%s%s%.0f" $frontendComponentName ":" $serverFrontendServicePort ) }}"
+          rpcAddress: "{{ $clusterInfo.rpcAddress | default (printf "%s%s%d" $frontendComponentName ":" $serverFrontendServicePort ) }}"
+          rpcTransport: "{{ $serverFrontendServiceTransport }}"
       {{- end }}
 
     dcRedirectionPolicy:

diff --git a/cadence/values.yaml b/cadence/values.yaml
@@ -8,7 +8,7 @@ debug: false
 server:
   image:
     repository: ubercadence/server
-    tag: 0.23.2
+    tag: 0.24.0
     pullPolicy: IfNotPresent
 
   # Global default settings (can be overridden per service)
@@ -214,6 +214,7 @@ server:
       type: ClusterIP
       grpcPort: 7833
       port: 7933
+      transport: grpc # grpc or tchannel
       annotations: {}
     metrics:
       annotations: {}
@@ -310,7 +311,7 @@ web:
 
   image:
     repository: ubercadence/web
-    tag: v3.29.5
+    tag: v3.32.0
     pullPolicy: IfNotPresent
 
   tcheck: