From 6dbc99fdf6fa06393688f781f2cb55c45323c3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Thu, 17 Nov 2022 19:25:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20v2.28.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/Chart.yaml                  |  4 +--
 charts/jumpserver/README.md                   |  2 +-
 .../templates/magnus/deployment-magnus.yaml   | 12 --------
 charts/jumpserver/values.yaml                 | 28 +++++++++----------
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/charts/jumpserver/Chart.yaml b/charts/jumpserver/Chart.yaml
index 53a267f..218dc8b 100644
--- a/charts/jumpserver/Chart.yaml
+++ b/charts/jumpserver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.27.0"
+appVersion: "v2.28.0"
 description: A Helm chart for Deploying Jumpserver on Kubernetes
 engine: gotpl
 home: https://jumpserver.org
@@ -10,4 +10,4 @@ maintainers:
 sources:
 - https://github.com/jumpserver/
 name: jumpserver
-version: 2.27.0
+version: 2.28.0
diff --git a/charts/jumpserver/README.md b/charts/jumpserver/README.md
index 2aa99a6..9fbcfab 100644
--- a/charts/jumpserver/README.md
+++ b/charts/jumpserver/README.md
@@ -30,7 +30,7 @@ helm repo add jumpserver https://jumpserver.github.io/helm-charts
 | `nameOveride`             | name override      | `nil`       |
 | `fullNameOveride`         | full name override | `nil`       |
 | `global.imageRegistry`    | 仓库地址           | `docker.io` |
-| `global.imageTag`         | 版本号             | `v2.27.0  ` |
+| `global.imageTag`         | 版本号             | `v2.28.0  ` |
 | `global.imagePullSecrets` | 私有仓库认证凭据    | `nil`       |
 | `global.storageClass`     | 存储 sc            | `nil`       |
 | `ingress.enabled`         | 开启 ingress       | `true`      |
diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
index 989e768..c4ad28e 100644
--- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@@ -61,21 +61,9 @@ spec:
               protocol: TCP
             {{- end }}
           livenessProbe:
-            {{- if .livenessProbe }}
             {{- toYaml .livenessProbe | nindent 12 }}
-            {{- else }}
-            failureThreshold: 30
-            tcpSocket:
-              port: magnus-{{ $magnusPortStart }}
-            {{- end }}
           readinessProbe:
-            {{- if .readinessProbe }}
             {{- toYaml .readinessProbe | nindent 12 }}
-            {{- else }}
-            failureThreshold: 30
-            tcpSocket:
-              port: magnus-{{ $magnusPortStart }}
-            {{- end }}
           resources:
             {{- toYaml .resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index de5ae9d..e140ad0 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 global:
   imageRegistry: "docker.io"
-  imageTag: v2.27.0
+  imageTag: v2.28.0
   ## E.g.
   #  imagePullSecrets:
   #  - myRegistryKeySecretName
@@ -85,7 +85,7 @@ core:
   image:
     registry: docker.io
     repository: jumpserver/core
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -174,7 +174,7 @@ koko:
   image:
     registry: docker.io
     repository: jumpserver/koko
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -265,7 +265,7 @@ lion:
   image:
     registry: docker.io
     repository: jumpserver/lion
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -356,7 +356,7 @@ magnus:
   image:
     registry: docker.io
     repository: jumpserver/magnus
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -364,14 +364,14 @@ magnus:
   env: []
 
   livenessProbe: {}
-    # failureThreshold: 30
-    # tcpSocket:
-      # port: 30000
+    failureThreshold: 30
+    tcpSocket:
+      port: 9090
 
   readinessProbe: {}
-    # failureThreshold: 30
-    # tcpSocket:
-      # port: 30000
+    failureThreshold: 30
+    tcpSocket:
+      port: 9090
 
   podSecurityContext: {}
     # fsGroup: 2000
@@ -437,7 +437,7 @@ omnidb:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/omnidb
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -516,7 +516,7 @@ razor:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/razor
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -593,7 +593,7 @@ web:
   image:
     registry: docker.io
     repository: jumpserver/web
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []

From f155c18b5986ab3eac7c5457d2198bf7180ce929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Thu, 17 Nov 2022 19:39:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index e140ad0..2d092ee 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -363,12 +363,12 @@ magnus:
 
   env: []
 
-  livenessProbe: {}
+  livenessProbe:
     failureThreshold: 30
     tcpSocket:
       port: 9090
 
-  readinessProbe: {}
+  readinessProbe:
     failureThreshold: 30
     tcpSocket:
       port: 9090