From 634bfc5ca991f5f5df7c496f42c7d46bf087f9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Wed, 31 Aug 2022 10:03:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20redis=20proxy?=
 =?UTF-8?q?=20=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/templates/magnus/deployment-magnus.yaml | 3 +++
 charts/jumpserver/templates/magnus/service-magnus.yaml    | 4 ++++
 charts/jumpserver/values.yaml                             | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
index 9b2631b..bd590f9 100644
--- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@@ -59,6 +59,9 @@ spec:
             - name: mariadb
               containerPort: {{ .service.mariadb.port }}
               protocol: TCP
+            - name: redis
+              containerPort: {{ .service.redis.port }}
+              protocol: TCP
             {{- if $.Values.xpack.enabled }}
             - name: postgre
               containerPort: {{ .service.postgre.port }}
diff --git a/charts/jumpserver/templates/magnus/service-magnus.yaml b/charts/jumpserver/templates/magnus/service-magnus.yaml
index 4bb97e5..e52b905 100644
--- a/charts/jumpserver/templates/magnus/service-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/service-magnus.yaml
@@ -21,6 +21,10 @@ spec:
       targetPort: mariadb
       protocol: TCP
       name: mariadb
+    - port: {{ .service.redis.port }}
+      targetPort: redis
+      protocol: TCP
+      name: redis
     {{- if $.Values.xpack.enabled }}
     - port: {{ .service.postgre.port }}
       targetPort: postgre
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index f74a45a..933b435 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -390,6 +390,8 @@ magnus:
       port: 33060
     mariadb:
       port: 33061
+    redis:
+      port: 63790
     postgre:
       port: 54320
     oracle11g:

From f429533438ae5dc94fd244d1f44b60d2162f9708 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, 1 Sep 2022 16:16:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20v2.25.4?=
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 +-
 charts/jumpserver/values.yaml | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/jumpserver/Chart.yaml b/charts/jumpserver/Chart.yaml
index 086056d..840ce54 100644
--- a/charts/jumpserver/Chart.yaml
+++ b/charts/jumpserver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.25.3"
+appVersion: "v2.25.4"
 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.25.3
+version: 2.25.4
diff --git a/charts/jumpserver/README.md b/charts/jumpserver/README.md
index fd9b61c..341d5a9 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.25.3  ` |
+| `global.imageTag`         | 版本号             | `v2.25.4  ` |
 | `global.imagePullSecrets` | 私有仓库认证凭据    | `nil`       |
 | `global.storageClass`     | 存储 sc            | `nil`       |
 | `ingress.enabled`         | 开启 ingress       | `true`      |
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index 933b435..69d4ada 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 global:
   imageRegistry: "docker.io"
-  imageTag: v2.25.3
+  imageTag: v2.25.4
   ## E.g.
   #  imagePullSecrets:
   #  - myRegistryKeySecretName
@@ -85,7 +85,7 @@ core:
   image:
     registry: docker.io
     repository: jumpserver/core
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -174,7 +174,7 @@ koko:
   image:
     registry: docker.io
     repository: jumpserver/koko
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -265,7 +265,7 @@ lion:
   image:
     registry: docker.io
     repository: jumpserver/lion
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -356,7 +356,7 @@ magnus:
   image:
     registry: docker.io
     repository: jumpserver/magnus
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -448,7 +448,7 @@ omnidb:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/omnidb
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -527,7 +527,7 @@ razor:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/razor
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []
@@ -604,7 +604,7 @@ web:
   image:
     registry: docker.io
     repository: jumpserver/web
-    tag: v2.25.3
+    tag: v2.25.4
     pullPolicy: IfNotPresent
 
   command: []