diff --git a/cadence/Chart.yaml b/cadence/Chart.yaml index ec0fff71..ca8ac6b6 100644 --- a/cadence/Chart.yaml +++ b/cadence/Chart.yaml @@ -1,5 +1,5 @@ name: cadence -version: 0.21.2 +version: 0.21.3 appVersion: 0.21.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 diff --git a/cadence/README.md b/cadence/README.md index a4cb35ff..ee2c2f39 100644 --- a/cadence/README.md +++ b/cadence/README.md @@ -349,6 +349,7 @@ Global options overridable per service are marked with an asterisk. | `server.config.persistence.[store].sql` | SQL connection details (see `values.yaml`) | `{}` | | `server.[service].service.type` | `[service]` service type | `ClusterIP` | | `server.[service].service.port` | `[service]` service port | `7933/7934/7935/7939` | +| `server.[service].service.annotations` | `[service]` service annotations | `{}` | | `server.[service].metrics.annotations.enabled` | Annotate `[service]` pods with Prometheus annotations | `` | | `server.[service].metrics.serviceMonitor.enabled` | Enable Prometheus ServiceMonitor for `[service]` | `` | | `server.[service].metrics.prometheus.timerType` | `[service]` Prometheus timer type | `` | diff --git a/cadence/templates/server-service.yaml b/cadence/templates/server-service.yaml index 11aa5ece..61fb5332 100644 --- a/cadence/templates/server-service.yaml +++ b/cadence/templates/server-service.yaml @@ -2,6 +2,10 @@ apiVersion: v1 kind: Service metadata: name: {{ include "cadence.componentname" (list . "frontend") }} + {{- with .Values.server.frontend.service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} labels: app.kubernetes.io/name: {{ include "cadence.name" . }} helm.sh/chart: {{ include "cadence.chart" . }} @@ -32,6 +36,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "cadence.componentname" (list $ (printf "%s-headless" $service)) }} + labels: app.kubernetes.io/name: {{ include "cadence.name" $ }} helm.sh/chart: {{ include "cadence.chart" $ }} @@ -47,6 +52,9 @@ metadata: # some versions of Kubernetes: # https://github.com/kubernetes/kubernetes/issues/58662 service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" + {{- with $serviceValues.service.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: ClusterIP clusterIP: None diff --git a/cadence/values.yaml b/cadence/values.yaml index 3290e9d2..fdb3281a 100644 --- a/cadence/values.yaml +++ b/cadence/values.yaml @@ -213,6 +213,7 @@ server: type: ClusterIP grpcPort: 7833 port: 7933 + annotations: {} metrics: annotations: {} # enabled: false @@ -236,6 +237,7 @@ server: # type: ClusterIP grpcPort: 7834 port: 7934 + annotations: {} metrics: annotations: {} # enabled: false @@ -259,6 +261,7 @@ server: # type: ClusterIP grpcPort: 7835 port: 7935 + annotations: {} metrics: annotations: {} # enabled: false @@ -281,6 +284,7 @@ server: service: # type: ClusterIP port: 7939 + annotations: {} metrics: annotations: {} # enabled: false