From 9eb585661accfc00a33d40f47a93621cc7f9fd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=20=E5=BB=BA=E6=98=8C?= Date: Thu, 18 Aug 2022 09:54:25 +0800 Subject: [PATCH] update mysql deployment **Phenomenon and reproduction steps** update mysql deployment **Root cause and solution** **Impactions** **Test method** **Affected branch(es)** * main **Checklist** - [ ] Dependencies update required - [ ] Common bug (similar problem in other repo) --- charts/deepflow-agent/Chart.yaml | 2 +- charts/deepflow/Chart.yaml | 2 +- .../charts/mysql/templates/deployment.yaml | 12 +++--------- charts/deepflow/charts/mysql/values.yaml | 17 +++++++++++++++++ 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml index c0fa568..ec99c78 100644 --- a/charts/deepflow-agent/Chart.yaml +++ b/charts/deepflow-agent/Chart.yaml @@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers. name: deepflow-agent engine: gotpl type: application -version: 0.1.015 +version: 0.1.016 appVersion: "6.1.1" kubeVersion: ">=1.16.0-0" sources: diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml index ed8eec9..df1cacb 100644 --- a/charts/deepflow/Chart.yaml +++ b/charts/deepflow/Chart.yaml @@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers. name: deepflow engine: gotpl type: application -version: 0.1.015 +version: 0.1.016 appVersion: "6.1.1" kubeVersion: ">=1.16.0-0" sources: diff --git a/charts/deepflow/charts/mysql/templates/deployment.yaml b/charts/deepflow/charts/mysql/templates/deployment.yaml index b8bbb10..c4ebfaf 100644 --- a/charts/deepflow/charts/mysql/templates/deployment.yaml +++ b/charts/deepflow/charts/mysql/templates/deployment.yaml @@ -57,16 +57,10 @@ spec: - name: tcp containerPort: 30130 protocol: TCP - readinessProbe: - tcpSocket: - port: tcp - initialDelaySeconds: 5 - periodSeconds: 10 livenessProbe: - tcpSocket: - port: tcp - initialDelaySeconds: 15 - periodSeconds: 20 + {{ toYaml .Values.server.livenessProbe | nindent 12 }} + readinessProbe: + {{ toYaml .Values.server.readinessProbe | nindent 12 }} resources: {{- toYaml .Values.resources | nindent 12 }} env: diff --git a/charts/deepflow/charts/mysql/values.yaml b/charts/deepflow/charts/mysql/values.yaml index e3de94e..16c327c 100644 --- a/charts/deepflow/charts/mysql/values.yaml +++ b/charts/deepflow/charts/mysql/values.yaml @@ -28,6 +28,23 @@ podAnnotations: {} podSecurityContext: {} # fsGroup: 2000 +readinessProbe: + httpGet: + path: /v1/health/ + port: server + failureThreshold: 6 + initialDelaySeconds: 15 + periodSeconds: 10 + successThreshold: 1 +livenessProbe: + failureThreshold: 3 + initialDelaySeconds: 15 + periodSeconds: 20 + successThreshold: 1 + httpGet: + path: /v1/health/ + port: server + timeoutSeconds: 1 securityContext: {} storageConfig: