From d4c045f6d60a6c0660883cfb60e731dbae28d42f Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 15 Oct 2021 10:30:59 +0200 Subject: [PATCH 1/6] feat(Cadence): updated web 3.28.4->3.28.7 --- cadence/README.md | 2 +- cadence/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cadence/README.md b/cadence/README.md index ee2c2f39..b0fdaceb 100644 --- a/cadence/README.md +++ b/cadence/README.md @@ -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.28.4` | +| `web.image.tag` | WebUI image tag | `3.28.7` | | `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/values.yaml b/cadence/values.yaml index fdb3281a..1501790f 100644 --- a/cadence/values.yaml +++ b/cadence/values.yaml @@ -309,7 +309,7 @@ web: image: repository: ubercadence/web - tag: v3.28.4 + tag: v3.28.7 pullPolicy: IfNotPresent tcheck: From f561a8eb38da6d5f27859423295aff57170ae746 Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 15 Oct 2021 11:30:21 +0200 Subject: [PATCH 2/6] chore(Cadence): removed obsolete comment --- cadence/values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cadence/values.yaml b/cadence/values.yaml index 1501790f..802afe67 100644 --- a/cadence/values.yaml +++ b/cadence/values.yaml @@ -159,7 +159,6 @@ server: existingSecret: "" consistency: One # datacenter: "us-east-1a" - # maxQPS: 1000 # maxConns: 2 sql: @@ -173,7 +172,6 @@ server: # maxConns: 20 # maxIdleConns: 20 # maxConnLifetime: "1h" - # maxQPS: 1000 # connectAttributes: # tx_isolation: "READ-COMMITTED" @@ -189,7 +187,6 @@ server: existingSecret: "" consistency: One # datacenter: "us-east-1a" - # maxQPS: 1000 # maxConns: 2 sql: @@ -203,7 +200,6 @@ server: # maxConns: 20 # maxIdleConns: 20 # maxConnLifetime: "1h" - # maxQPS: 1000 # connectAttributes: # tx_isolation: "READ-COMMITTED" From fdf6655832a9ec3dc4e4a238a99a3b3eea41da9b Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Mon, 18 Oct 2021 17:30:19 +0200 Subject: [PATCH 3/6] chore(Cadence): renamed Cassandra->NoSQL internally-only --- cadence/templates/server-configmap.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cadence/templates/server-configmap.yaml b/cadence/templates/server-configmap.yaml index 9229f290..590c583d 100644 --- a/cadence/templates/server-configmap.yaml +++ b/cadence/templates/server-configmap.yaml @@ -23,7 +23,8 @@ data: datastores: default: {{- if eq (include "cadence.persistence.driver" (list . "default")) "cassandra" }} - cassandra: + nosql: + pluginName: cassandra hosts: {{ include "cadence.persistence.cassandra.hosts" (list . "default") }} port: {{ include "cadence.persistence.cassandra.port" (list . "default") }} password: {{ `{{ .Env.CADENCE_STORE_PASSWORD }}` }} @@ -45,7 +46,8 @@ data: {{- end }} visibility: {{- if eq (include "cadence.persistence.driver" (list . "visibility")) "cassandra" }} - cassandra: + nosql: + pluginName: cassandra hosts: {{ include "cadence.persistence.cassandra.hosts" (list . "visibility") }} port: {{ include "cadence.persistence.cassandra.port" (list . "visibility") }} password: {{ `{{ .Env.CADENCE_VISIBILITY_STORE_PASSWORD }}` }} From dbd6eca54921f82cecc7200e519393ce2617a33f Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 15 Oct 2021 15:07:41 +0200 Subject: [PATCH 4/6] feat(Cadence): added Cass. proto version config --- cadence/templates/server-job.yaml | 4 ++++ cadence/values.yaml | 6 ++++++ cadence/values/values.cassandra.yaml | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/cadence/templates/server-job.yaml b/cadence/templates/server-job.yaml index b0706ab5..85318873 100644 --- a/cadence/templates/server-job.yaml +++ b/cadence/templates/server-job.yaml @@ -87,6 +87,10 @@ spec: value: {{ first (splitList "," (include "cadence.persistence.cassandra.hosts" (list $ $store))) }} - name: CASSANDRA_DB_PORT value: {{ include "cadence.persistence.cassandra.port" (list $ $store) | quote }} + {{- if $storeConfig.cassandra.protoVersion }} + - name: CASSANDRA_PROTOCOL_VERSION + value: {{ $storeConfig.cassandra.protoVersion }} + {{- end }} - name: CASSANDRA_KEYSPACE value: {{ $storeConfig.cassandra.keyspace }} {{- if $storeConfig.cassandra.user }} diff --git a/cadence/values.yaml b/cadence/values.yaml index 802afe67..866892e1 100644 --- a/cadence/values.yaml +++ b/cadence/values.yaml @@ -161,6 +161,9 @@ server: # datacenter: "us-east-1a" # maxConns: 2 + # protoVersion is the protocol Version to connect to cassandra host. + # protoVersion: 4 + sql: pluginName: "" # mysql host: "" @@ -189,6 +192,9 @@ server: # datacenter: "us-east-1a" # maxConns: 2 + # protoVersion is the protocol Version to connect to cassandra host. + # protoVersion: 4 + sql: pluginName: "" # mysql host: "" diff --git a/cadence/values/values.cassandra.yaml b/cadence/values/values.cassandra.yaml index ba623092..a669619c 100644 --- a/cadence/values/values.cassandra.yaml +++ b/cadence/values/values.cassandra.yaml @@ -10,6 +10,9 @@ server: keyspace: "cadence" consistency: "One" + # protoVersion is the protocol Version to connect to cassandra host. + # protoVersion: 4 + # Authentication # user: "" # password: "" @@ -23,6 +26,9 @@ server: keyspace: "cadence_visibility" consistency: "One" + # protoVersion is the protocol Version to connect to cassandra host. + # protoVersion: 4 + # Authentication # user: "" # password: "" From b29f60b3063d8ea10bef61e225e3c552a89598b1 Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 15 Oct 2021 16:01:56 +0200 Subject: [PATCH 5/6] feat(Cadence): updated server 0.21.3->0.22.3 --- cadence/Chart.yaml | 2 +- cadence/README.md | 4 ++-- cadence/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cadence/Chart.yaml b/cadence/Chart.yaml index ca8ac6b6..81dafe99 100644 --- a/cadence/Chart.yaml +++ b/cadence/Chart.yaml @@ -1,6 +1,6 @@ name: cadence version: 0.21.3 -appVersion: 0.21.3 +appVersion: 0.22.3 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 index b0fdaceb..8f443635 100644 --- 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.21.0+ +- Cadence 0.22.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.21.3` | +| `server.image.tag` | Server image tag | `0.22.3` | | `server.image.pullPolicy` | Server image pull policy | `IfNotPresent` | | `server.replicaCount`* | Server replica count | `1` | | `server.metrics.annotations.enabled`* | Annotate pods with Prometheus annotations | `false` | diff --git a/cadence/values.yaml b/cadence/values.yaml index 866892e1..460ce0e3 100644 --- a/cadence/values.yaml +++ b/cadence/values.yaml @@ -8,7 +8,7 @@ debug: false server: image: repository: ubercadence/server - tag: 0.21.3 + tag: 0.22.3 pullPolicy: IfNotPresent # Global default settings (can be overridden per service) From ed8decda12f932eb6fa43e9ccce2e3abb6ce21a0 Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 15 Oct 2021 16:02:55 +0200 Subject: [PATCH 6/6] release(Cadence): Helm chart 0.22.0 --- cadence/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cadence/Chart.yaml b/cadence/Chart.yaml index 81dafe99..715a011c 100644 --- a/cadence/Chart.yaml +++ b/cadence/Chart.yaml @@ -1,5 +1,5 @@ name: cadence -version: 0.21.3 +version: 0.22.0 appVersion: 0.22.3 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