From 1aa6028745b002a67b29397a1262e6db4a827671 Mon Sep 17 00:00:00 2001
From: wojiushixiaobai <296015668@qq.com>
Date: Tue, 6 Jul 2021 19:49:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0v2.11.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Chart.yaml                       |  2 +-
 templates/deployment-celery.yaml |  2 +-
 values.yaml                      | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index 035f65d..01b825d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.11.3"
+appVersion: "v2.11.4"
 description: A Helm chart for Deploying Jumpserver on Kubernetes
 name: jumpserver
 version: 0.1.0
diff --git a/templates/deployment-celery.yaml b/templates/deployment-celery.yaml
index 01781f3..986b4ce 100644
--- a/templates/deployment-celery.yaml
+++ b/templates/deployment-celery.yaml
@@ -52,7 +52,7 @@ spec:
           livenessProbe:
             exec:
               command:
-                - /opt/py3/bin/python /opt/jumpserver/apps/manage.py check_celery
+                - /opt/py3/bin/python /opt/jumpserver/jms status task | grep stopped && exit 1 || exit 0
           resources:
             {{- toYaml .resources | nindent 12 }}
           volumeMounts:
diff --git a/values.yaml b/values.yaml
index 62e80ed..acc36ca 100644
--- a/values.yaml
+++ b/values.yaml
@@ -62,7 +62,7 @@ core:
 
   image:
     repository: docker.io/jumpserver/jms_core
-    tag: v2.11.3
+    tag: v2.11.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -152,7 +152,7 @@ koko:
 
   image:
     repository: docker.io/jumpserver/jms_koko
-    tag: v2.11.3
+    tag: v2.11.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -161,12 +161,14 @@ koko:
 
   livenessProbe:
     failureThreshold: 30
-    tcpSocket:
+    httpGet:
+      path: /koko/health/
       port: web
 
   readinessProbe:
     failureThreshold: 30
-    tcpSocket:
+    httpGet:
+      path: /koko/health/
       port: web
 
   podSecurityContext: {}
@@ -238,7 +240,7 @@ lion:
 
   image:
     repository: docker.io/jumpserver/jms_lion
-    tag: v2.11.3
+    tag: v2.11.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -315,7 +317,7 @@ nginx:
 
   image:
     repository: docker.io/jumpserver/jms_nginx
-    tag: v2.11.3
+    tag: v2.11.4
     pullPolicy: IfNotPresent
 
   command: []