From 5677098f99f80c0df412101f34f9a746a9c11149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=20=E5=BB=BA=E6=98=8C?= Date: Tue, 9 Aug 2022 16:14:37 +0800 Subject: [PATCH] [Chart] update probe **Phenomenon and reproduction steps** update probe https://github.com/deepflowys/deepflow/issues/544 **Root cause and solution** **Impactions** (Visible changes after this fix) **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/deepflow/templates/app-deployment.yaml | 25 ++++++++++++------- .../templates/server-statefulset.yaml | 6 +++-- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml index 61ef161..f9993b6 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.006 +version: 0.1.007 appVersion: "6.1.1" kubeVersion: ">=1.16.0-0" sources: diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml index fe5bf4c..e5eabbd 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.006 +version: 0.1.007 appVersion: "6.1.1" kubeVersion: ">=1.16.0-0" sources: diff --git a/charts/deepflow/templates/app-deployment.yaml b/charts/deepflow/templates/app-deployment.yaml index 30914dd..4ab0667 100644 --- a/charts/deepflow/templates/app-deployment.yaml +++ b/charts/deepflow/templates/app-deployment.yaml @@ -34,16 +34,23 @@ spec: imagePullPolicy: "{{ tpl .Values.image.app.pullPolicy . }}" ports: - name: app - containerPort: 20404 + containerPort: 20418 protocol: TCP - # livenessProbe: - # httpGet: - # path: / - # port: http - # readinessProbe: - # httpGet: - # path: / - # port: http + readinessProbe: + tcpSocket: + port: app + failureThreshold: 3 + initialDelaySeconds: 15 + periodSeconds: 10 + successThreshold: 1 + livenessProbe: + failureThreshold: 3 + initialDelaySeconds: 15 + periodSeconds: 20 + successThreshold: 1 + tcpSocket: + port: app + timeoutSeconds: 1 resources: {{- toYaml .Values.app.resources | nindent 12 }} volumeMounts: diff --git a/charts/deepflow/templates/server-statefulset.yaml b/charts/deepflow/templates/server-statefulset.yaml index 5db3264..d48f6f7 100644 --- a/charts/deepflow/templates/server-statefulset.yaml +++ b/charts/deepflow/templates/server-statefulset.yaml @@ -55,7 +55,8 @@ spec: name: querier protocol: TCP readinessProbe: - tcpSocket: + httpGet: + path: /v1/health/ port: server failureThreshold: 12 initialDelaySeconds: 15 @@ -66,7 +67,8 @@ spec: initialDelaySeconds: 15 periodSeconds: 20 successThreshold: 1 - tcpSocket: + httpGet: + path: /v1/health/ port: server timeoutSeconds: 1 resources: