Merge pull request #109 from wojiushixiaobai/main

feat: 更新 v2.28.0

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

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`      |

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:

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,22 +356,22 @@ magnus:
   image:
     registry: docker.io
     repository: jumpserver/magnus
-    tag: v2.27.0
+    tag: v2.28.0
     pullPolicy: IfNotPresent
 
   command: []
 
   env: []
 
-  livenessProbe: {}
-    # failureThreshold: 30
-    # tcpSocket:
-      # port: 30000
+  livenessProbe:
+    failureThreshold: 30
+    tcpSocket:
+      port: 9090
 
-  readinessProbe: {}
-    # failureThreshold: 30
-    # tcpSocket:
-      # port: 30000
+  readinessProbe:
+    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: []