Merge branch 'temporalio:main' into main

temporalio · Jan 27, 2025 · 9246a07 · 9246a07
2 parents 467f30b + 31d1f4c
commit 9246a07
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/charts/temporal/templates/server-configmap.yaml b/charts/temporal/templates/server-configmap.yaml
@@ -96,6 +96,9 @@ data:
         excludeTags:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- with $server.metrics.prefix }}
+        prefix: "{{- . }}"
+        {{- end }}
         {{- with $server.config.prometheus }}
         prometheus:
           {{- toYaml . | nindent 10 }}

diff --git a/charts/temporal/templates/web-deployment.yaml b/charts/temporal/templates/web-deployment.yaml
@@ -41,6 +41,10 @@ spec:
             - secretRef:
                 name: {{ .Values.web.additionalEnvSecretName }}
           {{- end }}
+          livenessProbe:
+            initialDelaySeconds: 10
+            tcpSocket:
+              port: http
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/temporal/values.yaml b/charts/temporal/values.yaml
@@ -34,6 +34,7 @@ server:
     tags: {}
     # Tags to be excluded in Prometheus metrics
     excludeTags: {}
+    prefix:
     # Enable Prometheus ServiceMonitor
     # Use this if you installed the Prometheus Operator (https://github.com/coreos/prometheus-operator).
     serviceMonitor:
@@ -153,7 +154,7 @@ server:
               consistency: "local_quorum"
               serialConsistency: "local_serial"
         sql:
-          driver: "mysql"
+          driver: "mysql8"
           host: "mysql"
           port: 3306
           database: "temporal"
@@ -183,7 +184,7 @@ server:
               consistency: "local_quorum"
               serialConsistency: "local_serial"
         sql:
-          driver: "mysql"
+          driver: "mysql8"
           host: "mysql"
           port: 3306
           database: "temporal_visibility"

diff --git a/charts/temporal/values/values.aurora-mysql.yaml b/charts/temporal/values/values.aurora-mysql.yaml
@@ -5,7 +5,7 @@ server:
         driver: "sql"
 
         sql:
-          driver: "mysql"
+          driver: "mysql8"
           host: _HOST_
           port: 3306
           database: temporal
@@ -20,7 +20,7 @@ server:
         driver: "sql"
 
         sql:
-          driver: "mysql"
+          driver: "mysql8"
           host: _HOST_
           port: 3306
           database: temporal_visibility