Merge branch 'v1' into remove-prometheus-dep-2

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: Lint Charts
+
+on: pull_request
+
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/[email protected]
+        with:
+          version: v3.14.4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+          check-latest: true
+
+      - name: Set up chart-testing
+        uses: helm/[email protected]
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Run chart-testing (lint)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct lint --check-version-increment=false --target-branch ${{ github.event.repository.default_branch }}

.github/workflows/publish-charts.yml

@@ -10,7 +10,7 @@ on:
         description: "Temporal Admin Tools version to use for release (for example 1.24.1-tctl-1.18.1-cli-0.12.0)"
         required: true
       ui_version:
-        description: "Temporal UI version to use for release (for example 2.27.2)"
+        description: "Temporal UI version to use for release (for example 2.27.2). Please make sure to use version from https://github.com/temporalio/ui-server/releases!"
         required: true
       bump:
         description: "Chart version bump level"
@@ -100,7 +100,7 @@ jobs:
           git commit -m "Update Chart to ${{ steps.chart-version.outputs.chart_version }}." Chart.yaml values.yaml
           git tag -a "temporal-${{ steps.chart-version.outputs.chart_version }}" -m "Release Chart: ${{ steps.chart-version.outputs.chart_version }}"
 
-          git push --tags origin master
+          git push --tags origin main
 
       - name: Install Helm
         uses: azure/setup-helm@v3

CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Contributing Guidelines
+
+Contributions are welcome via GitHub pull requests. This document outlines the process to help get your contribution accepted.
+
+Note: All contributors also need to fill out the Temporal Contributor License Agreement before we can merge in any of your changes. When you submit a PR, Github will prompt you to complete the CLA, if you have not already done so.
+
+## How to Contribute
+
+1. Fork this repository, develop
+1. Test your changes
+1. Submit a pull request
+
+Note: Please do not bump the Chart version as this is automated as part of our release process.
+
+Please include in your PR description a note of how you tested your changes.
+
+### Technical Requirements
+
+* Must follow [Charts best practices](https://helm.sh/docs/topics/chart_best_practices/)
+
+Releases for the Helm Charts are not triggered automatically, the Temporal team will periodically do releases.
+
+### Getting help
+
+If you would like help getting your PR ready, please feel free to come and chat to us on [Temporal's public Slack](https://t.mp/slack). The Temporal team that works on the charts and the contributor community hang out in the #helm-charts channel.
+
+### Community Requirements
+
+By participating in this project you agree to abide by its terms.
+See the Temporal [Code of Conduct](https://temporal.io/code-of-conduct).

charts/temporal/Chart.yaml

@@ -7,7 +7,7 @@ keywords:
   - workflow
   - orchestration
 maintainers:
-  - name: Temporal Technologies Inc.
+  - name: temporalio
     url: https://temporal.io/
 sources:
   - https://github.com/temporalio/temporal
@@ -35,7 +35,7 @@ dependencies:
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.43.0
+version: 0.46.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.24.2
+appVersion: 1.25.0

charts/temporal/ci/cassandra-es-values.yaml

@@ -0,0 +1,13 @@
+server:
+  replicaCount: 1
+cassandra:
+  enabled: true
+  config:
+    cluster_size: 1
+elasticsearch:
+  enabled: true
+  replicas: 1
+prometheus:
+  enabled: false
+grafana:
+  enabled: false

charts/temporal/ci/postgres-es-values.yaml

@@ -0,0 +1,25 @@
+server:
+  replicaCount: 1
+  config:
+    persistence:
+      defaultStore: default
+      default:
+        driver: "sql"
+        sql:
+          driver: "postgres12"
+          host: "postgres-postgresql.postgres"
+          port: 5432
+          database: "temporal"
+          user: "temporal"
+          password: "temporal"
+          maxConns: 20
+          maxConnLifetime: "1h"
+elasticsearch:
+  enabled: true
+  replicas: 1
+cassandra:
+  enabled: false
+prometheus:
+  enabled: false
+grafana:
+  enabled: false

charts/temporal/ci/postgres-values.yaml

@@ -0,0 +1,35 @@
+server:
+  replicaCount: 1
+  config:
+    persistence:
+      defaultStore: default
+      default:
+        driver: "sql"
+        sql:
+          driver: "postgres12"
+          host: "postgres-postgresql.postgres"
+          port: 5432
+          database: "temporal"
+          user: "temporal"
+          password: "temporal"
+          maxConns: 20
+          maxConnLifetime: "1h"
+      visibility:
+        driver: "sql"
+        sql:
+          driver: "postgres12"
+          host: "postgres-postgresql.postgres"
+          port: 5432
+          database: "temporal"
+          user: "temporal"
+          password: "temporal"
+          maxConns: 20
+          maxConnLifetime: "1h"
+cassandra:
+  enabled: false
+elasticsearch:
+  enabled: false
+prometheus:
+  enabled: false
+grafana:
+  enabled: false

charts/temporal/templates/_admintools-env.yaml

@@ -0,0 +1,81 @@
+{{- define "temporal.admintools-env" -}}
+{{- $global := index . 0 -}}
+{{- $store := index . 1 -}}
+{{- $storeConfig := index $global.Values.server.config.persistence $store }}
+{{- $driver := include "temporal.persistence.driver" (list $global $store) -}}
+{{- $driverConfig := index $storeConfig $driver }}
+{{- if eq $driver "elasticsearch" -}}
+{{- $driverConfig = $global.Values.elasticsearch -}}
+{{- end -}}
+{{- if eq $driver "cassandra" }}
+- name: CASSANDRA_HOST
+  value: {{ first (splitList "," (include "temporal.persistence.cassandra.hosts" (list $global $store))) }}
+- name: CASSANDRA_PORT
+  value: {{ include "temporal.persistence.cassandra.port" (list $global $store) | quote }}
+- name: CASSANDRA_KEYSPACE
+  value: {{ $driverConfig.keyspace }}
+- name: CASSANDRA_USER
+  value: {{ $driverConfig.user }}
+- name: CASSANDRA_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "temporal.persistence.secretName" (list $global $store) }}
+      key: {{ include "temporal.persistence.secretKey" (list $global $store) }}
+{{- else if eq $driver "sql" }}
+- name: SQL_PLUGIN
+  value: {{ include "temporal.persistence.sql.driver" (list $global $store) }}
+- name: SQL_HOST
+  value: {{ include "temporal.persistence.sql.host" (list $global $store) }}
+- name: SQL_PORT
+  value: {{ include "temporal.persistence.sql.port" (list $global $store) | quote }}
+- name: SQL_DATABASE
+  value: {{ include "temporal.persistence.sql.database" (list $global $store) }}
+- name: SQL_USER
+  value: {{ $driverConfig.user }}
+- name: SQL_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "temporal.persistence.secretName" (list $global $store) }}
+      key: {{ include "temporal.persistence.secretKey" (list $global $store) }}
+  {{- with $driverConfig.tls }}
+- name: SQL_TLS
+  value: {{ .enabled | quote }}
+    {{- with .caFile }}
+- name: SQL_TLS_CA_FILE
+  value: {{ . }}
+    {{- end }}
+    {{- if and .certFile .keyFile }}
+- name: SQL_TLS_CERT_FILE
+  value: {{ .certFile }}
+- name: SQL_TLS_KEY_FILE
+  value: {{ .keyFile }}
+    {{- end }}
+    {{- with .serverName }}
+- name: SQL_TLS_SERVER_NAME
+  value: {{ . }}
+    {{- end }}
+    {{- if hasKey . "enableHostVerification" }}
+- name: SQL_TLS_DISABLE_HOST_VERIFICATION
+  value: {{ not .enableHostVerification | quote }}
+    {{- end }}
+  {{- end }}
+{{- else if eq $driver "elasticsearch" }}
+- name: ES_SCHEME
+  value: {{ $driverConfig.scheme }}
+- name: ES_HOST
+  value: {{ $driverConfig.host }}
+- name: ES_PORT
+  value: {{ $driverConfig.port | quote }}
+- name: ES_USER
+  value: {{ $driverConfig.username | quote }}
+- name: ES_PWD
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "temporal.persistence.secretName" (list $global $store) }}
+      key: {{ include "temporal.persistence.secretKey" (list $global $store) }}
+- name: ES_VERSION
+  value: {{ $driverConfig.version }}
+- name: ES_VISIBILITY_INDEX
+  value: {{ $driverConfig.visibilityIndex }}
+{{- end }}
+{{- end -}}