diff --git a/charts/temporal/templates/_admintools-env.yaml b/charts/temporal/templates/_admintools-env.yaml index 7547a080..f5e7f73a 100644 --- a/charts/temporal/templates/_admintools-env.yaml +++ b/charts/temporal/templates/_admintools-env.yaml @@ -74,6 +74,8 @@ value: {{ splitList ":" $url.host | first }} - name: ES_PORT value: {{ splitList ":" $url.host | last | quote }} +- name: ES_SERVER + value: {{ urlJoin $url }} - name: ES_USER value: {{ $store.config.username | quote }} - name: ES_PWD diff --git a/charts/temporal/templates/_helpers.tpl b/charts/temporal/templates/_helpers.tpl index ad323cda..a99e06e3 100644 --- a/charts/temporal/templates/_helpers.tpl +++ b/charts/temporal/templates/_helpers.tpl @@ -155,7 +155,7 @@ app.kubernetes.io/part-of: {{ $global.Chart.Name }} {{- $_ := unset $storeConfig "password" -}} {{- end -}} {{- end -}} - {{- $_ := set $dsCopy $storeType (omit $storeConfig "existingSecret" "secretKey") -}} + {{- $_ := set $dsCopy $storeType (omit $storeConfig "existingSecret" "secretKey" "createDatabase" "manageSchema") -}} {{- end -}} {{- end -}} {{- $_ := set $patchedDatastores $name $dsCopy -}} @@ -179,13 +179,31 @@ app.kubernetes.io/part-of: {{ $global.Chart.Name }} {{- $config := get $datastores $storeName -}} {{- if hasKey $config "sql" -}} {{- $_ := set $store "driver" "sql" -}} - {{- $_ := set $store "config" (get $config "sql") -}} + {{- $storeConfig := get $config "sql" -}} + {{- if not (hasKey $storeConfig "createDatabase") -}} + {{- $_ := set $storeConfig "createDatabase" true -}} + {{- end -}} + {{- if not (hasKey $storeConfig "manageSchema") -}} + {{- $_ := set $storeConfig "manageSchema" true -}} + {{- end -}} + {{- $_ := set $store "config" $storeConfig -}} {{- else if hasKey $config "cassandra" -}} {{- $_ := set $store "driver" "cassandra" -}} - {{- $_ := set $store "config" (get $config "cassandra") -}} + {{- $storeConfig := get $config "cassandra" -}} + {{- if not (hasKey $storeConfig "createDatabase") -}} + {{- $_ := set $storeConfig "createDatabase" true -}} + {{- end -}} + {{- if not (hasKey $storeConfig "manageSchema") -}} + {{- $_ := set $storeConfig "manageSchema" true -}} + {{- end -}} + {{- $_ := set $store "config" $storeConfig -}} {{- else if hasKey $config "elasticsearch" -}} {{- $_ := set $store "driver" "elasticsearch" -}} - {{- $_ := set $store "config" (get $config "elasticsearch") -}} + {{- $storeConfig := get $config "elasticsearch" -}} + {{- if not (hasKey $storeConfig "manageSchema") -}} + {{- $_ := set $storeConfig "manageSchema" true -}} + {{- end -}} + {{- $_ := set $store "config" $storeConfig -}} {{- else -}} {{- fail (printf "No valid driver configured for %s store" $store.name) -}} {{- end -}} diff --git a/charts/temporal/templates/server-deployment.yaml b/charts/temporal/templates/server-deployment.yaml index c54fc948..c41d09e8 100644 --- a/charts/temporal/templates/server-deployment.yaml +++ b/charts/temporal/templates/server-deployment.yaml @@ -107,11 +107,9 @@ spec: subPath: config_template.yaml - name: dynamic-config mountPath: /etc/temporal/dynamic_config - {{- if semverCompare "~1.29.0" $.Values.server.image.tag }} - name: shims mountPath: /usr/local/bin/dockerize subPath: dockerize - {{- end }} {{- if $.Values.server.additionalVolumeMounts }} {{- toYaml $.Values.server.additionalVolumeMounts | nindent 12}} {{- end }} @@ -126,12 +124,10 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} volumes: - {{- if semverCompare "~1.29.0" $.Values.server.image.tag}} - name: shims configMap: name: "{{ include "temporal.fullname" $ }}-shims" defaultMode: 0555 - {{- end }} - name: config configMap: name: "{{ include "temporal.fullname" $ }}-config" diff --git a/charts/temporal/templates/server-job.yaml b/charts/temporal/templates/server-job.yaml index f95f2a86..d262a5d9 100644 --- a/charts/temporal/templates/server-job.yaml +++ b/charts/temporal/templates/server-job.yaml @@ -1,4 +1,3 @@ -{{- if or $.Values.schema.createDatabase.enabled $.Values.schema.setup.enabled $.Values.schema.update.enabled }} apiVersion: batch/v1 kind: Job metadata: @@ -6,7 +5,7 @@ metadata: labels: {{- include "temporal.resourceLabels" (list $ "database" "") | nindent 4 }} spec: - backoffLimit: {{ $.Values.schema.setup.backoffLimit }} + backoffLimit: {{ $.Values.schema.backoffLimit }} ttlSecondsAfterFinished: 86400 template: metadata: @@ -27,50 +26,18 @@ spec: {{- with $.Values.admintools.additionalInitContainers }} {{- toYaml . | nindent 8 }} {{- end }} - {{- if $.Values.schema.createDatabase.enabled }} - {{- range $_, $store := (include "temporal.persistence.eachStore" $ | fromYaml) }} - {{- if ne $store.driver "elasticsearch" }} + {{- range $_, $store := (include "temporal.persistence.eachStore" $ | fromYaml) }} + {{- if $store.config.createDatabase }} - name: create-{{ $store.name }}-store - image: "{{ $.Values.admintools.image.repository }}:{{ $.Values.admintools.image.tag }}" - imagePullPolicy: {{ $.Values.admintools.image.pullPolicy }} - {{- if eq $store.driver "cassandra" }} - command: ['temporal-cassandra-tool', 'create', '-k', '{{ $store.config.keyspace }}', '--replication-factor', '{{ $store.config.replicationFactor | default 1 }}'] - {{- else if eq $store.driver "sql" }} - command: ['temporal-sql-tool', 'create-database'] - {{- end }} - env: - {{- include "temporal.admintools-env" (list $ $store) | nindent 12 }} - {{- with $.Values.admintools.additionalVolumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with $.Values.schema.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with $.Values.schema.containerSecurityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- end }} - {{- end }} - {{- end }} - {{- if $.Values.schema.setup.enabled }} - {{- range $_, $store := (include "temporal.persistence.eachStore" $ | fromYaml) }} - - name: setup-{{ $store.name }}-store image: "{{ $.Values.admintools.image.repository }}:{{ $.Values.admintools.image.tag }}" imagePullPolicy: {{ $.Values.admintools.image.pullPolicy }} {{- if eq $store.driver "cassandra" }} - command: ['temporal-cassandra-tool', 'setup-schema', '-v', '0.0'] + command: ['temporal-cassandra-tool', 'create', '-k', '{{ $store.config.keyspace }}', '--replication-factor', '{{ $store.config.replicationFactor | default 1 }}'{{- if $store.config.datacenter }}, '-- +datacenter', '{{ $store.config.datacenter }}'{{- end }}] {{- else if eq $store.driver "sql" }} - command: ['temporal-sql-tool', 'setup-schema', '-v', '0.0'] - {{- else if eq $store.driver "elasticsearch" }} - # TODO: Use temporal-elasticsearch-tool if available. curl will not be part of the image in the future. - command: ['sh', '-c'] - args: - - 'curl -X PUT --fail --user "$ES_USER:$ES_PWD" $ES_SCHEME://$ES_HOST:$ES_PORT/_template/temporal_visibility_v1_template -H "Content-Type: application/json" --data-binary "@schema/elasticsearch/visibility/index_template_$ES_VERSION.json" 2>&1 && - curl --head --fail --user "$ES_USER:$ES_PWD" $ES_SCHEME://$ES_HOST:$ES_PORT/$ES_VISIBILITY_INDEX 2>&1 || - curl -X PUT --fail --user "$ES_USER:$ES_PWD" $ES_SCHEME://$ES_HOST:$ES_PORT/$ES_VISIBILITY_INDEX 2>&1' + command: ['temporal-sql-tool', 'create-database'] + {{- else -}} + {{- fail (printf "createDatabase is not supported for %s store" $store.driver) -}} {{- end }} env: {{- include "temporal.admintools-env" (list $ $store) | nindent 12 }} @@ -87,37 +54,42 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} - {{- end }} - {{- if $.Values.schema.update.enabled }} - {{- range $_, $store := (include "temporal.persistence.eachStore" $ | fromYaml) }} + {{- if $store.config.manageSchema }} {{- $schema := include "temporal.persistence.schema" $store }} - {{- if ne $store.driver "elasticsearch" }} - - name: update-{{ $store.name }}-store + - name: manage-schema-{{ $store.name }}-store image: "{{ $.Values.admintools.image.repository }}:{{ $.Values.admintools.image.tag }}" imagePullPolicy: {{ $.Values.admintools.image.pullPolicy }} - {{- if eq $store.driver "cassandra" }} - command: ['temporal-cassandra-tool', 'update-schema', '--schema-dir', '/etc/temporal/schema/cassandra/{{ $schema }}/versioned'] - {{- else if eq $store.driver "sql" }} - {{- if eq $store.config.pluginName "mysql8" }} - command: ['temporal-sql-tool', 'update-schema', '--schema-dir', '/etc/temporal/schema/mysql/v8/{{ $schema }}/versioned'] - {{- else if or (eq $store.config.pluginName "postgres12") (eq $store.config.pluginName "postgres12_pgx") }} - command: ['temporal-sql-tool', 'update-schema', '--schema-dir', '/etc/temporal/schema/postgresql/v12/{{ $schema }}/versioned'] - {{- end }} + command: ['sh', '-c'] + args: + {{- if eq $store.driver "cassandra" }} + - temporal-cassandra-tool setup-schema -v 0.0 && temporal-cassandra-tool update-schema --schema-dir /etc/temporal/schema/cassandra/{{ $schema }}/versioned + {{- else if eq $store.driver "sql" }} + {{- if eq $store.config.pluginName "mysql8" }} + - temporal-sql-tool setup-schema -v 0.0 && temporal-sql-tool update-schema --schema-dir /etc/temporal/schema/mysql/v8/{{ $schema }}/versioned + {{- else if or (eq $store.config.pluginName "postgres12") (eq $store.config.pluginName "postgres12_pgx") }} + - temporal-sql-tool setup-schema -v 0.0 && temporal-sql-tool update-schema --schema-dir /etc/temporal/schema/postgresql/v12/{{ $schema }}/versioned + {{- else -}} + {{- fail (printf "manageSchema is not supported for %s SQL database plugin" $store.config.pluginName) -}} {{- end }} + {{- else if eq $store.driver "elasticsearch" }} + - temporal-elasticsearch-tool setup-schema && temporal-elasticsearch-tool create-index && temporal-elasticsearch-tool update-schema --index "$ES_VISIBILITY_INDEX" + {{- end }} env: - {{- include "temporal.admintools-env" (list $ $store) | nindent 12 }} - {{- with $.Values.admintools.additionalVolumeMounts }} + {{- include "temporal.admintools-env" (list $ $store) | nindent 12 }} volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with $.Values.schema.resources }} + {{- with $.Values.admintools.additionalVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} + - name: shims + mountPath: /usr/local/sbin/temporal-elasticsearch-tool + subPath: temporal-elasticsearch-tool + {{- with $.Values.schema.resources }} resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with $.Values.schema.containerSecurityContext }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with $.Values.schema.containerSecurityContext }} securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} {{- end }} @@ -183,8 +155,13 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- with $.Values.admintools.additionalVolumes }} + {{- if or $.Values.admintools.additionalVolumes true }} volumes: - {{- toYaml . | nindent 8 }} + {{- with $.Values.admintools.additionalVolumes }} + {{- toYaml . | nindent 8 }} + {{- end }} + - name: shims + configMap: + name: "{{ include "temporal.fullname" $ }}-shims" + defaultMode: 0555 {{- end }} -{{- end -}} diff --git a/charts/temporal/templates/server-secret.yaml b/charts/temporal/templates/server-secret.yaml index 8f2d7cb5..294af2a9 100644 --- a/charts/temporal/templates/server-secret.yaml +++ b/charts/temporal/templates/server-secret.yaml @@ -1,5 +1,4 @@ -{{- if or $.Values.server.enabled $.Values.schema.createDatabase.enabled $.Values.schema.setup.enabled $.Values.schema.update.enabled }} - {{- range $_, $store := (include "temporal.persistence.eachStore" $ | fromYaml) }} +{{- range $_, $store := (include "temporal.persistence.eachStore" $ | fromYaml) }} {{- if empty $store.config.existingSecret }} apiVersion: v1 kind: Secret @@ -15,6 +14,5 @@ type: Opaque data: password: {{ default "" $store.config.password | b64enc | quote }} --- -{{- end }} -{{- end }} + {{- end }} {{- end }} diff --git a/charts/temporal/templates/shim-configmap.yaml b/charts/temporal/templates/shim-configmap.yaml index e859e051..5e3c9f09 100644 --- a/charts/temporal/templates/shim-configmap.yaml +++ b/charts/temporal/templates/shim-configmap.yaml @@ -1,5 +1,3 @@ -{{- if semverCompare "~1.29.0" $.Values.server.image.tag -}} -{{- /* To simplify the helm chart during the transition from 1.29.* to 1.30.0 we polyfill dockerize and temporal-elasticsearch-tool for 1.29.* */ -}} apiVersion: v1 kind: ConfigMap metadata: @@ -40,4 +38,277 @@ data: echo "Skipped dockerize, copied $SRC to $DST" fi -{{- end -}} + temporal-elasticsearch-tool: |- + #!/bin/sh + set -e + + if [ -x /usr/local/bin/temporal-elasticsearch-tool ]; then + exec /usr/local/bin/temporal-elasticsearch-tool "$@" + fi + + # Build base URL from environment variables + ES_URL="${ES_SCHEME}://${ES_HOST}:${ES_PORT}" + + # Build curl auth string if credentials are provided + CURL_AUTH="" + if [ -n "$ES_USER" ] && [ -n "$ES_PWD" ]; then + CURL_AUTH="--user ${ES_USER}:${ES_PWD}" + fi + + # Helper function to make curl requests + curl_request() { + local method="$1" + local path="$2" + local data_file="$3" + local fail_silently="$4" + + local curl_cmd="curl -X ${method} --silent --show-error ${CURL_AUTH} ${ES_URL}${path}" + + if [ -n "$data_file" ]; then + curl_cmd="${curl_cmd} -H 'Content-Type: application/json' --data-binary @${data_file}" + fi + + if [ "$fail_silently" != "true" ]; then + curl_cmd="${curl_cmd} --fail" + fi + + curl_cmd="${curl_cmd} 2>&1" + + eval "$curl_cmd" + } + + # Parse command + COMMAND="${1:-}" + shift || true + + case "$COMMAND" in + setup-schema) + # Setup cluster settings and index template + if [ -z "$ES_VERSION" ]; then + echo "Error: ES_VERSION environment variable is required" >&2 + exit 1 + fi + + CLUSTER_SETTINGS_FILE="schema/elasticsearch/visibility/cluster_settings_v7.json" + TEMPLATE_FILE="schema/elasticsearch/visibility/index_template_${ES_VERSION}.json" + + if [ ! -f "$TEMPLATE_FILE" ]; then + echo "Error: Template file not found: $TEMPLATE_FILE" >&2 + exit 1 + fi + + FAIL_SILENTLY="false" + while [ $# -gt 0 ]; do + case "$1" in + --fail) + FAIL_SILENTLY="true" + shift + ;; + *) + shift + ;; + esac + done + + # Setup cluster settings if file exists + if [ -f "$CLUSTER_SETTINGS_FILE" ]; then + echo "Setting up cluster settings..." + curl_request "PUT" "/_cluster/settings" "$CLUSTER_SETTINGS_FILE" "$FAIL_SILENTLY" >/dev/null + echo "Cluster settings setup complete" + else + echo "Warning: Cluster settings file not found: $CLUSTER_SETTINGS_FILE, skipping cluster settings" + fi + + echo "Setting up index template..." + curl_request "PUT" "/_template/temporal_visibility_v1_template" "$TEMPLATE_FILE" "$FAIL_SILENTLY" >/dev/null + echo "Template setup complete" + ;; + + update-schema) + # Update index template and optionally index mappings + if [ -z "$ES_VERSION" ]; then + echo "Error: ES_VERSION environment variable is required" >&2 + exit 1 + fi + + TEMPLATE_FILE="schema/elasticsearch/visibility/index_template_${ES_VERSION}.json" + if [ ! -f "$TEMPLATE_FILE" ]; then + echo "Error: Template file not found: $TEMPLATE_FILE" >&2 + exit 1 + fi + + INDEX_NAME="" + FAIL_SILENTLY="false" + while [ $# -gt 0 ]; do + case "$1" in + --index) + shift + INDEX_NAME="$1" + shift + ;; + --fail) + FAIL_SILENTLY="true" + shift + ;; + *) + shift + ;; + esac + done + + echo "Updating index template..." + curl_request "PUT" "/_template/temporal_visibility_v1_template" "$TEMPLATE_FILE" "$FAIL_SILENTLY" >/dev/null + + if [ -n "$INDEX_NAME" ]; then + echo "Updating index mappings for $INDEX_NAME..." + + # Check if index exists + HTTP_CODE=$(curl --head --silent --write-out "%{http_code}" --output /dev/null ${CURL_AUTH} ${ES_URL}/${INDEX_NAME} 2>/dev/null) + if [ "$HTTP_CODE" != "200" ]; then + echo "Error: Index $INDEX_NAME does not exist" >&2 + exit 1 + fi + + # Extract mappings from template using jq + MAPPINGS=$(jq -c '.mappings' "$TEMPLATE_FILE") + if [ -z "$MAPPINGS" ] || [ "$MAPPINGS" = "null" ]; then + echo "Error: No mappings found in template file" >&2 + exit 1 + fi + + # Create temporary file with mappings + MAPPINGS_FILE=$(mktemp) + echo "$MAPPINGS" > "$MAPPINGS_FILE" + + # Update index mappings + curl_request "PUT" "/${INDEX_NAME}/_mapping" "$MAPPINGS_FILE" "$FAIL_SILENTLY" >/dev/null + + # Clean up temporary file + rm -f "$MAPPINGS_FILE" + + echo "Index mappings updated successfully" + fi + echo "Schema update complete" + ;; + + create-index) + # Create visibility index + INDEX_NAME="" + FAIL_SILENTLY="false" + while [ $# -gt 0 ]; do + case "$1" in + --index) + shift + INDEX_NAME="$1" + shift + ;; + --fail) + FAIL_SILENTLY="true" + shift + ;; + *) + shift + ;; + esac + done + + # Use ES_VISIBILITY_INDEX env var if --index not provided + if [ -z "$INDEX_NAME" ]; then + INDEX_NAME="$ES_VISIBILITY_INDEX" + fi + + if [ -z "$INDEX_NAME" ]; then + echo "Error: Index name required (use --index or ES_VISIBILITY_INDEX env var)" >&2 + exit 1 + fi + + # Check if index already exists + HTTP_CODE=$(curl --head --silent --write-out "%{http_code}" --output /dev/null ${CURL_AUTH} ${ES_URL}/${INDEX_NAME} 2>/dev/null) + if [ "$HTTP_CODE" = "200" ]; then + echo "Index $INDEX_NAME already exists, skipping creation" + exit 0 + fi + + echo "Creating index $INDEX_NAME..." + # Create the index, handling the case where it already exists + # (as a fallback if the HEAD check above didn't catch it) + CREATE_OUTPUT=$(curl -X PUT --silent --show-error --write-out "\n%{http_code}" ${CURL_AUTH} ${ES_URL}/${INDEX_NAME} -H "Content-Type: application/json" 2>&1) + HTTP_CODE=$(echo "$CREATE_OUTPUT" | tail -n1) + CREATE_BODY=$(echo "$CREATE_OUTPUT" | head -n-1) + + if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "201" ]; then + echo "Index created successfully" + elif [ "$HTTP_CODE" = "400" ] && echo "$CREATE_BODY" | jq -e '.error.type == "resource_already_exists_exception"' >/dev/null 2>&1; then + echo "Index $INDEX_NAME already exists, skipping creation" + exit 0 + else + if [ "$FAIL_SILENTLY" != "true" ]; then + echo "Error: Failed to create index (HTTP $HTTP_CODE): $CREATE_BODY" >&2 + exit 1 + fi + fi + ;; + + drop-index) + # Delete visibility index + INDEX_NAME="" + FAIL_SILENTLY="false" + while [ $# -gt 0 ]; do + case "$1" in + --index) + shift + INDEX_NAME="$1" + shift + ;; + --fail) + FAIL_SILENTLY="true" + shift + ;; + *) + shift + ;; + esac + done + + # Use ES_VISIBILITY_INDEX env var if --index not provided + if [ -z "$INDEX_NAME" ]; then + INDEX_NAME="$ES_VISIBILITY_INDEX" + fi + + if [ -z "$INDEX_NAME" ]; then + echo "Error: Index name required (use --index or ES_VISIBILITY_INDEX env var)" >&2 + exit 1 + fi + + echo "Dropping index $INDEX_NAME..." + curl_request "DELETE" "/${INDEX_NAME}" "" "$FAIL_SILENTLY" >/dev/null + echo "Index dropped successfully" + ;; + + ping) + # Ping elasticsearch host + echo "Pinging Elasticsearch at ${ES_URL}..." + if curl --fail --silent --show-error ${CURL_AUTH} ${ES_URL} >/dev/null 2>&1; then + echo "Pong - Elasticsearch is reachable" + exit 0 + else + echo "Ping failed - Elasticsearch is not reachable" >&2 + exit 1 + fi + ;; + + *) + echo "Usage: $0 {setup-schema|update-schema|create-index|drop-index|ping} [options]" >&2 + echo "" >&2 + echo "Commands:" >&2 + echo " setup-schema Setup elasticsearch index template" >&2 + echo " update-schema Update elasticsearch index template (and optionally index mappings with --index)" >&2 + echo " create-index Create elasticsearch visibility index" >&2 + echo " drop-index Delete elasticsearch visibility index" >&2 + echo " ping Ping the elasticsearch host" >&2 + echo "" >&2 + echo "Environment variables:" >&2 + echo " ES_SCHEME, ES_HOST, ES_PORT, ES_USER, ES_PWD, ES_VERSION, ES_VISIBILITY_INDEX" >&2 + exit 1 + ;; + esac diff --git a/charts/temporal/templates/tests/test.yaml b/charts/temporal/templates/tests/test.yaml index 3a52a657..d76cd5ba 100644 --- a/charts/temporal/templates/tests/test.yaml +++ b/charts/temporal/templates/tests/test.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "temporal.fullname" . }}-test-wfl" + name: "{{ include "temporal.fullname" . }}-test-cluster-health" labels: {{- include "temporal.resourceLabels" (list $ "test" "") | nindent 4 }} annotations: @@ -9,7 +9,7 @@ metadata: spec: {{ include "temporal.serviceAccount" . }} containers: - - name: workflow-list + - name: cluster-health image: "{{ .Values.admintools.image.repository }}:{{ .Values.admintools.image.tag }}" imagePullPolicy: {{ .Values.admintools.image.pullPolicy }} command: ["temporal", "operator", "cluster", "health"] diff --git a/charts/temporal/tests/server_job_test.yaml b/charts/temporal/tests/server_job_test.yaml index 51298bf8..d256111c 100644 --- a/charts/temporal/tests/server_job_test.yaml +++ b/charts/temporal/tests/server_job_test.yaml @@ -26,7 +26,6 @@ tests: - it: includes additional init containers set: server: - enabled: false config: persistence: datastores: @@ -50,7 +49,6 @@ tests: - it: includes additional volumes set: server: - enabled: false config: persistence: datastores: @@ -74,7 +72,6 @@ tests: - it: includes additional volume mounts set: server: - enabled: false config: persistence: datastores: @@ -98,7 +95,6 @@ tests: - it: includes resource limits and requests on initContainers set: server: - enabled: false config: persistence: datastores: diff --git a/charts/temporal/values.yaml b/charts/temporal/values.yaml index dd594d34..c958d847 100644 --- a/charts/temporal/values.yaml +++ b/charts/temporal/values.yaml @@ -449,14 +449,7 @@ web: topologySpreadConstraints: [] podDisruptionBudget: {} schema: - createDatabase: - enabled: true - setup: - enabled: true - backoffLimit: 100 - update: - enabled: true - backoffLimit: 100 + backoffLimit: 100 podAnnotations: {} podLabels: {} resources: {}