From 6a882707c676222b0447843e3715b48d835ecaab Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Wed, 28 Aug 2024 16:54:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=9A=84POD=E9=9C=80=E8=A6=81=E7=83=AD=E8=BA=AB=20#10887?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helm-charts/core/ci/templates/artifactory/statefulset.yaml | 7 +++++++ helm-charts/core/ci/templates/auth/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/dispatch/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/environment/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/log/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/metrics/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/misc/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/notify/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/openapi/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/process/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/project/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/quality/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/repository/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/store/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/stream/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/ticket/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/turbo/deployment.yaml | 7 +++++++ helm-charts/core/ci/templates/websocket/statefulset.yaml | 7 +++++++ 18 files changed, 126 insertions(+) diff --git a/helm-charts/core/ci/templates/artifactory/statefulset.yaml b/helm-charts/core/ci/templates/artifactory/statefulset.yaml index 6f7038d5ab0..5290ac99f2c 100644 --- a/helm-charts/core/ci/templates/artifactory/statefulset.yaml +++ b/helm-charts/core/ci/templates/artifactory/statefulset.yaml @@ -130,6 +130,13 @@ spec: ln -s {{ .Values.persistence.mountPath }}/artifactory {{ .Values.config.bkCiDataDir }}/artifactory; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/auth/deployment.yaml b/helm-charts/core/ci/templates/auth/deployment.yaml index e9d8dd5ed19..a32f6ca0686 100644 --- a/helm-charts/core/ci/templates/auth/deployment.yaml +++ b/helm-charts/core/ci/templates/auth/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/dispatch/deployment.yaml b/helm-charts/core/ci/templates/dispatch/deployment.yaml index 63b8c4eb7b0..9b2e8a0e139 100644 --- a/helm-charts/core/ci/templates/dispatch/deployment.yaml +++ b/helm-charts/core/ci/templates/dispatch/deployment.yaml @@ -116,6 +116,13 @@ spec: ln -s /data/workspace/agent-package {{ .Values.config.bkCiHome }}/agent-package; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/environment/deployment.yaml b/helm-charts/core/ci/templates/environment/deployment.yaml index 9b5d850242f..306d3ac67e9 100644 --- a/helm-charts/core/ci/templates/environment/deployment.yaml +++ b/helm-charts/core/ci/templates/environment/deployment.yaml @@ -116,6 +116,13 @@ spec: ln -s /data/workspace/agent-package {{ .Values.config.bkCiHome }}/agent-package; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/log/deployment.yaml b/helm-charts/core/ci/templates/log/deployment.yaml index 279648a973e..fe2b6e310e2 100644 --- a/helm-charts/core/ci/templates/log/deployment.yaml +++ b/helm-charts/core/ci/templates/log/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/metrics/deployment.yaml b/helm-charts/core/ci/templates/metrics/deployment.yaml index 6c042094fd9..831a979c079 100644 --- a/helm-charts/core/ci/templates/metrics/deployment.yaml +++ b/helm-charts/core/ci/templates/metrics/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/misc/deployment.yaml b/helm-charts/core/ci/templates/misc/deployment.yaml index b6d96cfe6c8..92ccb300017 100644 --- a/helm-charts/core/ci/templates/misc/deployment.yaml +++ b/helm-charts/core/ci/templates/misc/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/notify/deployment.yaml b/helm-charts/core/ci/templates/notify/deployment.yaml index e18c35fd2fa..91973d5934b 100644 --- a/helm-charts/core/ci/templates/notify/deployment.yaml +++ b/helm-charts/core/ci/templates/notify/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/openapi/deployment.yaml b/helm-charts/core/ci/templates/openapi/deployment.yaml index 6e1727e65e2..f9df9bda7a4 100644 --- a/helm-charts/core/ci/templates/openapi/deployment.yaml +++ b/helm-charts/core/ci/templates/openapi/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/process/deployment.yaml b/helm-charts/core/ci/templates/process/deployment.yaml index 806ede7c8c3..1de6a380f04 100644 --- a/helm-charts/core/ci/templates/process/deployment.yaml +++ b/helm-charts/core/ci/templates/process/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/project/deployment.yaml b/helm-charts/core/ci/templates/project/deployment.yaml index a163070b673..4c32e6dc5e2 100644 --- a/helm-charts/core/ci/templates/project/deployment.yaml +++ b/helm-charts/core/ci/templates/project/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/quality/deployment.yaml b/helm-charts/core/ci/templates/quality/deployment.yaml index 8da188dc19e..b798af7d262 100644 --- a/helm-charts/core/ci/templates/quality/deployment.yaml +++ b/helm-charts/core/ci/templates/quality/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/repository/deployment.yaml b/helm-charts/core/ci/templates/repository/deployment.yaml index c871cbce991..14a40674295 100644 --- a/helm-charts/core/ci/templates/repository/deployment.yaml +++ b/helm-charts/core/ci/templates/repository/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/store/deployment.yaml b/helm-charts/core/ci/templates/store/deployment.yaml index e32a0d18725..e65c1191568 100644 --- a/helm-charts/core/ci/templates/store/deployment.yaml +++ b/helm-charts/core/ci/templates/store/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/stream/deployment.yaml b/helm-charts/core/ci/templates/stream/deployment.yaml index b85919ff929..57865cc4218 100644 --- a/helm-charts/core/ci/templates/stream/deployment.yaml +++ b/helm-charts/core/ci/templates/stream/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/ticket/deployment.yaml b/helm-charts/core/ci/templates/ticket/deployment.yaml index dd91cb732e1..02aed7b422c 100644 --- a/helm-charts/core/ci/templates/ticket/deployment.yaml +++ b/helm-charts/core/ci/templates/ticket/deployment.yaml @@ -114,6 +114,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState diff --git a/helm-charts/core/ci/templates/turbo/deployment.yaml b/helm-charts/core/ci/templates/turbo/deployment.yaml index f7c8fd664b2..83be255bf37 100644 --- a/helm-charts/core/ci/templates/turbo/deployment.yaml +++ b/helm-charts/core/ci/templates/turbo/deployment.yaml @@ -76,6 +76,13 @@ spec: - name: monitor containerPort: 18080 protocol: TCP + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/liveness diff --git a/helm-charts/core/ci/templates/websocket/statefulset.yaml b/helm-charts/core/ci/templates/websocket/statefulset.yaml index 4e4381c49a8..16f44b3532a 100644 --- a/helm-charts/core/ci/templates/websocket/statefulset.yaml +++ b/helm-charts/core/ci/templates/websocket/statefulset.yaml @@ -110,6 +110,13 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} + lifecycle: + preStop: + exec: + command: + - sh + - '-c' + - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState From ae6b3fba812c0f324b84dfc782d90c4c2b46d42a Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Wed, 28 Aug 2024 17:38:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=9A=84POD=E9=9C=80=E8=A6=81=E7=83=AD=E8=BA=AB=20#10887?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helm-charts/core/ci/templates/websocket/statefulset.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/helm-charts/core/ci/templates/websocket/statefulset.yaml b/helm-charts/core/ci/templates/websocket/statefulset.yaml index 16f44b3532a..bbe4d66142b 100644 --- a/helm-charts/core/ci/templates/websocket/statefulset.yaml +++ b/helm-charts/core/ci/templates/websocket/statefulset.yaml @@ -110,13 +110,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -145,7 +138,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data From 3c6bd234494a8eee24ea3d6f70bb9c2677a4ee86 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Wed, 28 Aug 2024 17:38:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=9A=84POD=E9=9C=80=E8=A6=81=E7=83=AD=E8=BA=AB=20#10887?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ci/templates/artifactory/statefulset.yaml | 9 +-------- helm-charts/core/ci/templates/auth/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/dispatch/deployment.yaml | 9 +-------- .../core/ci/templates/environment/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/log/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/metrics/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/misc/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/notify/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/openapi/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/process/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/project/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/quality/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/repository/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/store/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/stream/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/ticket/deployment.yaml | 9 +-------- helm-charts/core/ci/templates/turbo/deployment.yaml | 7 ------- 17 files changed, 16 insertions(+), 135 deletions(-) diff --git a/helm-charts/core/ci/templates/artifactory/statefulset.yaml b/helm-charts/core/ci/templates/artifactory/statefulset.yaml index 5290ac99f2c..0947e9d7fb9 100644 --- a/helm-charts/core/ci/templates/artifactory/statefulset.yaml +++ b/helm-charts/core/ci/templates/artifactory/statefulset.yaml @@ -130,13 +130,6 @@ spec: ln -s {{ .Values.persistence.mountPath }}/artifactory {{ .Values.config.bkCiDataDir }}/artifactory; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -167,7 +160,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - name: storage {{- if and .Values.persistence.enabled (eq .Values.config.bkCiArtifactoryRealm "local") }} diff --git a/helm-charts/core/ci/templates/auth/deployment.yaml b/helm-charts/core/ci/templates/auth/deployment.yaml index a32f6ca0686..e048980070d 100644 --- a/helm-charts/core/ci/templates/auth/deployment.yaml +++ b/helm-charts/core/ci/templates/auth/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/dispatch/deployment.yaml b/helm-charts/core/ci/templates/dispatch/deployment.yaml index 9b2e8a0e139..6dcbb649f47 100644 --- a/helm-charts/core/ci/templates/dispatch/deployment.yaml +++ b/helm-charts/core/ci/templates/dispatch/deployment.yaml @@ -116,13 +116,6 @@ spec: ln -s /data/workspace/agent-package {{ .Values.config.bkCiHome }}/agent-package; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -151,7 +144,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/environment/deployment.yaml b/helm-charts/core/ci/templates/environment/deployment.yaml index 306d3ac67e9..2ecf20e91d8 100644 --- a/helm-charts/core/ci/templates/environment/deployment.yaml +++ b/helm-charts/core/ci/templates/environment/deployment.yaml @@ -116,13 +116,6 @@ spec: ln -s /data/workspace/agent-package {{ .Values.config.bkCiHome }}/agent-package; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -151,7 +144,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/log/deployment.yaml b/helm-charts/core/ci/templates/log/deployment.yaml index fe2b6e310e2..f8fbd22e060 100644 --- a/helm-charts/core/ci/templates/log/deployment.yaml +++ b/helm-charts/core/ci/templates/log/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/metrics/deployment.yaml b/helm-charts/core/ci/templates/metrics/deployment.yaml index 831a979c079..78efb93f3ae 100644 --- a/helm-charts/core/ci/templates/metrics/deployment.yaml +++ b/helm-charts/core/ci/templates/metrics/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/misc/deployment.yaml b/helm-charts/core/ci/templates/misc/deployment.yaml index 92ccb300017..ba9dfbbf212 100644 --- a/helm-charts/core/ci/templates/misc/deployment.yaml +++ b/helm-charts/core/ci/templates/misc/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/notify/deployment.yaml b/helm-charts/core/ci/templates/notify/deployment.yaml index 91973d5934b..953eac2a8c6 100644 --- a/helm-charts/core/ci/templates/notify/deployment.yaml +++ b/helm-charts/core/ci/templates/notify/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/openapi/deployment.yaml b/helm-charts/core/ci/templates/openapi/deployment.yaml index f9df9bda7a4..d15313d2368 100644 --- a/helm-charts/core/ci/templates/openapi/deployment.yaml +++ b/helm-charts/core/ci/templates/openapi/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -154,7 +147,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/process/deployment.yaml b/helm-charts/core/ci/templates/process/deployment.yaml index 1de6a380f04..d43db8e46a6 100644 --- a/helm-charts/core/ci/templates/process/deployment.yaml +++ b/helm-charts/core/ci/templates/process/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/project/deployment.yaml b/helm-charts/core/ci/templates/project/deployment.yaml index 4c32e6dc5e2..bdd5a8e74c2 100644 --- a/helm-charts/core/ci/templates/project/deployment.yaml +++ b/helm-charts/core/ci/templates/project/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/quality/deployment.yaml b/helm-charts/core/ci/templates/quality/deployment.yaml index b798af7d262..a35887528e6 100644 --- a/helm-charts/core/ci/templates/quality/deployment.yaml +++ b/helm-charts/core/ci/templates/quality/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/repository/deployment.yaml b/helm-charts/core/ci/templates/repository/deployment.yaml index 14a40674295..7fa7cfce728 100644 --- a/helm-charts/core/ci/templates/repository/deployment.yaml +++ b/helm-charts/core/ci/templates/repository/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/store/deployment.yaml b/helm-charts/core/ci/templates/store/deployment.yaml index e65c1191568..cde89f895f7 100644 --- a/helm-charts/core/ci/templates/store/deployment.yaml +++ b/helm-charts/core/ci/templates/store/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/stream/deployment.yaml b/helm-charts/core/ci/templates/stream/deployment.yaml index 57865cc4218..45e30b0358b 100644 --- a/helm-charts/core/ci/templates/stream/deployment.yaml +++ b/helm-charts/core/ci/templates/stream/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/ticket/deployment.yaml b/helm-charts/core/ci/templates/ticket/deployment.yaml index 02aed7b422c..a7a55b7b8eb 100644 --- a/helm-charts/core/ci/templates/ticket/deployment.yaml +++ b/helm-charts/core/ci/templates/ticket/deployment.yaml @@ -114,13 +114,6 @@ spec: cp /data/workspace/backend.bkci.sh .; /bin/bash backend.bkci.sh; {{ end }} - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/livenessState @@ -149,7 +142,7 @@ spec: command: - /bin/bash - -c - - sleep 10 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 + - sleep 20 && ps -ef|grep java|grep -v grep|awk '{print $2}'|xargs kill -15 volumes: - hostPath: path: /data diff --git a/helm-charts/core/ci/templates/turbo/deployment.yaml b/helm-charts/core/ci/templates/turbo/deployment.yaml index 83be255bf37..f7c8fd664b2 100644 --- a/helm-charts/core/ci/templates/turbo/deployment.yaml +++ b/helm-charts/core/ci/templates/turbo/deployment.yaml @@ -76,13 +76,6 @@ spec: - name: monitor containerPort: 18080 protocol: TCP - lifecycle: - preStop: - exec: - command: - - sh - - '-c' - - sleep 10s livenessProbe: httpGet: path: /management/health/liveness