From c307019bb98cfd46580469c710aadb1bc465c03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 17 Jan 2022 14:16:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20deployment=20?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/templates/_helpers.tpl      | 12 +++++-----
 .../templates/celery/deployment-celery.yaml   | 22 +++++++++----------
 .../templates/core/deployment-core.yaml       | 22 +++++++++----------
 .../templates/koko/deployment-koko.yaml       | 10 ++++-----
 .../templates/lion/deployment-lion.yaml       | 10 ++++-----
 .../templates/pre-install-initdb.yaml         | 22 +++++++++----------
 6 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/charts/jumpserver/templates/_helpers.tpl b/charts/jumpserver/templates/_helpers.tpl
index 1f17059..9dd1396 100644
--- a/charts/jumpserver/templates/_helpers.tpl
+++ b/charts/jumpserver/templates/_helpers.tpl
@@ -64,11 +64,6 @@ Define JumpServer database
 {{- printf "%s-%s-master" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "jumpserver.redis.fullname" -}}
-{{- $name := default "redis" .Values.redis.nameOverride -}}
-{{- printf "%s-%s-master" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{- define "jumpserver.database.host" -}}
 {{- .Values.externalDatabase.host -}}
 {{- end -}}
@@ -97,6 +92,11 @@ Define JumpServer database
 Define JumpServer redis
 */}}
 
+{{- define "jumpserver.redis.fullname" -}}
+{{- $name := default "redis" .Values.redis.nameOverride -}}
+{{- printf "%s-%s-master" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "jumpserver.redis.host" -}}
 {{- .Values.externalRedis.host -}}
 {{- end -}}
@@ -159,4 +159,4 @@ Define JumpServer StorageClass
 {{- else -}}
 {{- .Values.xrdp.persistence.storageClassName -}}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml
index 0a77469..9c63612 100644
--- a/charts/jumpserver/templates/celery/deployment-celery.yaml
+++ b/charts/jumpserver/templates/celery/deployment-celery.yaml
@@ -56,25 +56,24 @@ spec:
               value: "{{ .service.web.port }}"
             - name: WS_LISTEN_PORT
               value: "{{ .service.ws.port }}"
-              {{- end }}
             - name: DB_ENGINE
-              value: {{ include "jumpserver.database.engine" . | quote }}
+              value: "{{ include "jumpserver.database.engine" $ }}"
             - name: DB_HOST
-              value: {{ include "jumpserver.database.host" . | quote }}
+              value: "{{ include "jumpserver.database.host" $ }}"
             - name: DB_PORT
-              value: {{ include "jumpserver.database.port" . | quote }}
+              value: "{{ include "jumpserver.database.port" $ }}"
             - name: DB_USER
-              value: {{ include "jumpserver.database.user" . | quote }}
+              value: "{{ include "jumpserver.database.user" $ }}"
             - name: DB_PASSWORD
-              value: {{ include "jumpserver.database.password" . | quote }}
+              value: "{{ include "jumpserver.database.password" $ }}"
             - name: DB_NAME
-              value: {{ include "jumpserver.database.database" . | quote }}
+              value: "{{ include "jumpserver.database.database" $ }}"
             - name: REDIS_HOST
-              value: {{ include "jumpserver.redis.host" . | quote }}
+              value: "{{ include "jumpserver.redis.host" $ }}"
             - name: REDIS_PORT
-              value: {{ include "jumpserver.redis.port" . | quote }}
+              value: "{{ include "jumpserver.redis.port" $ }}"
             - name: REDIS_PASSWORD
-              value: {{ include "jumpserver.redis.password" . | quote }}
+              value: "{{ include "jumpserver.redis.password" $ }}"
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
@@ -84,7 +83,7 @@ spec:
                 - /bin/bash
                 - /opt/jumpserver/utils/check_celery.sh
           resources:
-            {{- toYaml .resources | nindent 12 }}
+            {{- toYaml  .resources | nindent 12 }}
           volumeMounts:
             - mountPath: "/opt/jumpserver/config.yml"
               name: "jms-core-config"
@@ -123,3 +122,4 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml
index d05d85d..aad7f7d 100644
--- a/charts/jumpserver/templates/core/deployment-core.yaml
+++ b/charts/jumpserver/templates/core/deployment-core.yaml
@@ -57,29 +57,27 @@ spec:
               value: "{{ .service.web.port }}"
             - name: WS_LISTEN_PORT
               value: "{{ .service.ws.port }}"
-              {{- end }}
             - name: DB_ENGINE
-              value: {{ include "jumpserver.database.engine" . | quote }}
+              value: "{{ include "jumpserver.database.engine" $ }}"
             - name: DB_HOST
-              value: {{ include "jumpserver.database.host" . | quote }}
+              value: "{{ include "jumpserver.database.host" $ }}"
             - name: DB_PORT
-              value: {{ include "jumpserver.database.port" . | quote }}
+              value: "{{ include "jumpserver.database.port" $ }}"
             - name: DB_USER
-              value: {{ include "jumpserver.database.user" . | quote }}
+              value: "{{ include "jumpserver.database.user" $ }}"
             - name: DB_PASSWORD
-              value: {{ include "jumpserver.database.password" . | quote }}
+              value: "{{ include "jumpserver.database.password" $ }}"
             - name: DB_NAME
-              value: {{ include "jumpserver.database.database" . | quote }}
+              value: "{{ include "jumpserver.database.database" $ }}"
             - name: REDIS_HOST
-              value: {{ include "jumpserver.redis.host" . | quote }}
+              value: "{{ include "jumpserver.redis.host" $ }}"
             - name: REDIS_PORT
-              value: {{ include "jumpserver.redis.port" . | quote }}
+              value: "{{ include "jumpserver.redis.port" $ }}"
             - name: REDIS_PASSWORD
-              value: {{ include "jumpserver.redis.password" . | quote }}
+              value: "{{ include "jumpserver.redis.password" $ }}"
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
-          {{- with .Values.core }}
           ports:
             - name: web
               containerPort: {{ .service.web.port }}
@@ -87,7 +85,6 @@ spec:
             - name: ws
               containerPort: {{ .service.ws.port }}
               protocol: TCP
-          {{- end }}
           livenessProbe:
             {{- toYaml .livenessProbe | nindent 12}}
           readinessProbe:
@@ -132,3 +129,4 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/jumpserver/templates/koko/deployment-koko.yaml b/charts/jumpserver/templates/koko/deployment-koko.yaml
index e33aae7..95060e9 100644
--- a/charts/jumpserver/templates/koko/deployment-koko.yaml
+++ b/charts/jumpserver/templates/koko/deployment-koko.yaml
@@ -59,15 +59,14 @@ spec:
               value: "{{ .service.ssh.port }}"
             - name: HTTPD_PORT
               value: "{{ .service.web.port }}"
-              {{- end }}
             - name: SHARE_ROOM_TYPE
-              value: redis
+              value: "redis"
             - name: REDIS_HOST
-              value: {{ include "jumpserver.redis.host" . | quote }}
+              value: "{{ include "jumpserver.redis.host" $ }}"
             - name: REDIS_PORT
-              value: {{ include "jumpserver.redis.port" . | quote }}
+              value: "{{ include "jumpserver.redis.port" $ }}"
             - name: REDIS_PASSWORD
-              value: {{ include "jumpserver.redis.password" . | quote }}
+              value: "{{ include "jumpserver.redis.password" $ }}"
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
@@ -104,3 +103,4 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/jumpserver/templates/lion/deployment-lion.yaml b/charts/jumpserver/templates/lion/deployment-lion.yaml
index 49abd55..e948d3a 100644
--- a/charts/jumpserver/templates/lion/deployment-lion.yaml
+++ b/charts/jumpserver/templates/lion/deployment-lion.yaml
@@ -59,14 +59,13 @@ spec:
             - name: JUMPSERVER_COLOR_DEPTH
               value: "32"
             - name: SHARE_ROOM_TYPE
-              value: redis
-              {{- end }}
+              value: "redis"
             - name: REDIS_HOST
-              value: {{ include "jumpserver.redis.host" . | quote }}
+              value: "{{ include "jumpserver.redis.host" $ }}"
             - name: REDIS_PORT
-              value: {{ include "jumpserver.redis.port" . | quote }}
+              value: "{{ include "jumpserver.redis.port" $ }}"
             - name: REDIS_PASSWORD
-              value: {{ include "jumpserver.redis.password" . | quote }}
+              value: "{{ include "jumpserver.redis.password" $ }}"
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
@@ -103,3 +102,4 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/jumpserver/templates/pre-install-initdb.yaml b/charts/jumpserver/templates/pre-install-initdb.yaml
index beb8002..e9dd9d3 100644
--- a/charts/jumpserver/templates/pre-install-initdb.yaml
+++ b/charts/jumpserver/templates/pre-install-initdb.yaml
@@ -41,26 +41,26 @@ spec:
               value: "{{ .config.secretKey }}"
             - name: BOOTSTRAP_TOKEN
               value: "{{ .config.bootstrapToken }}"
-              {{- end }}
             - name: DB_ENGINE
-              value: {{ include "jumpserver.database.engine" . | quote }}
+              value: "{{ include "jumpserver.database.engine" $ }}"
             - name: DB_HOST
-              value: {{ include "jumpserver.database.host" . | quote }}
+              value: "{{ include "jumpserver.database.host" $ }}"
             - name: DB_PORT
-              value: {{ include "jumpserver.database.port" . | quote }}
+              value: "{{ include "jumpserver.database.port" $ }}"
             - name: DB_USER
-              value: {{ include "jumpserver.database.user" . | quote }}
+              value: "{{ include "jumpserver.database.user" $ }}"
             - name: DB_PASSWORD
-              value: {{ include "jumpserver.database.password" . | quote }}
+              value: "{{ include "jumpserver.database.password" $ }}"
             - name: DB_NAME
-              value: {{ include "jumpserver.database.database" . | quote }}
+              value: "{{ include "jumpserver.database.database" $ }}"
             - name: REDIS_HOST
-              value: {{ include "jumpserver.redis.host" . | quote }}
+              value: "{{ include "jumpserver.redis.host" $ }}"
             - name: REDIS_PORT
-              value: {{ include "jumpserver.redis.port" . | quote }}
+              value: "{{ include "jumpserver.redis.port" $ }}"
             - name: REDIS_PASSWORD
-              value: {{ include "jumpserver.redis.password" . | quote }}
+              value: "{{ include "jumpserver.redis.password" $ }}"
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
-      restartPolicy: Never
\ No newline at end of file
+      restartPolicy: Never
+{{- end }}

From c27ff14efca3631a2db39262733608294718f8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 17 Jan 2022 15:15:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/templates/celery/deployment-celery.yaml | 2 +-
 charts/jumpserver/templates/koko/deployment-koko.yaml     | 2 +-
 charts/jumpserver/templates/lion/deployment-lion.yaml     | 2 +-
 charts/jumpserver/templates/omnidb/deployment-omnidb.yaml | 2 +-
 charts/jumpserver/templates/xrdp/deployment-xrdp.yaml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml
index 9c63612..ede15ce 100644
--- a/charts/jumpserver/templates/celery/deployment-celery.yaml
+++ b/charts/jumpserver/templates/celery/deployment-celery.yaml
@@ -83,7 +83,7 @@ spec:
                 - /bin/bash
                 - /opt/jumpserver/utils/check_celery.sh
           resources:
-            {{- toYaml  .resources | nindent 12 }}
+            {{- toYaml .resources | nindent 12 }}
           volumeMounts:
             - mountPath: "/opt/jumpserver/config.yml"
               name: "jms-core-config"
diff --git a/charts/jumpserver/templates/koko/deployment-koko.yaml b/charts/jumpserver/templates/koko/deployment-koko.yaml
index 95060e9..9c50c94 100644
--- a/charts/jumpserver/templates/koko/deployment-koko.yaml
+++ b/charts/jumpserver/templates/koko/deployment-koko.yaml
@@ -50,7 +50,7 @@ spec:
               protocol: TCP
           env:
             - name: CORE_HOST
-              value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
+              value: "http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}"
             - name: BOOTSTRAP_TOKEN
               value: "{{ $.Values.core.config.bootstrapToken }}"
             - name: LOG_LEVEL
diff --git a/charts/jumpserver/templates/lion/deployment-lion.yaml b/charts/jumpserver/templates/lion/deployment-lion.yaml
index e948d3a..566dd46 100644
--- a/charts/jumpserver/templates/lion/deployment-lion.yaml
+++ b/charts/jumpserver/templates/lion/deployment-lion.yaml
@@ -47,7 +47,7 @@ spec:
               protocol: TCP
           env:
             - name: CORE_HOST
-              value: http://{{ include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
+              value: "http://{{ include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}"
             - name: BOOTSTRAP_TOKEN
               value: "{{ $.Values.core.config.bootstrapToken }}"
             - name: LOG_LEVEL
diff --git a/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml b/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
index 8f4a8af..383e4d1 100644
--- a/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
+++ b/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
@@ -43,7 +43,7 @@ spec:
           {{- end }}
           env:
             - name: CORE_HOST
-              value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
+              value: "http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}"
             - name: BOOTSTRAP_TOKEN
               value: "{{ $.Values.core.config.bootstrapToken }}"
             - name: LOG_LEVEL
diff --git a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
index e03fe27..ec372f6 100644
--- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
+++ b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
@@ -43,7 +43,7 @@ spec:
           {{- end }}
           env:
             - name: CORE_HOST
-              value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
+              value: "http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}"
             - name: BOOTSTRAP_TOKEN
               value: "{{ $.Values.core.config.bootstrapToken }}"
             - name: LOG_LEVEL

From a39254c9746dbd19d20da066ef50708aff94644e 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, 20 Jan 2022 17:36:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20v2.18.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 +-
 charts/jumpserver/values.yaml | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/jumpserver/Chart.yaml b/charts/jumpserver/Chart.yaml
index 8fc270d..341c838 100644
--- a/charts/jumpserver/Chart.yaml
+++ b/charts/jumpserver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.17.3"
+appVersion: "v2.18.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.17.3
+version: 2.18.0
diff --git a/charts/jumpserver/README.md b/charts/jumpserver/README.md
index 2e5cdf8..fda685a 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.17.3  ` |
+| `global.imageTag`         | 版本号             | `v2.18.0  ` |
 | `global.imagePullSecrets` | 私有仓库认证凭据    | `nil`
 | `global.storageClass`     | 存储 sc            | `nil`       |
 | `ingress.enabled`         | 开启 ingress       | `true`      |
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index 6dc9802..46e118d 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 global:
   imageRegistry: "docker.io"
-  imageTag: v2.17.3
+  imageTag: v2.18.0
   ## E.g.
   #  imagePullSecrets:
   #  - myRegistryKeySecretName
@@ -85,7 +85,7 @@ core:
   image:
     registry: docker.io
     repository: jumpserver/core
-    tag: v2.17.3
+    tag: v2.18.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -170,7 +170,7 @@ koko:
   image:
     registry: docker.io
     repository: jumpserver/koko
-    tag: v2.17.3
+    tag: v2.18.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -254,7 +254,7 @@ lion:
   image:
     registry: docker.io
     repository: jumpserver/lion
-    tag: v2.17.3
+    tag: v2.18.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -336,7 +336,7 @@ omnidb:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/omnidb
-    tag: v2.17.3
+    tag: v2.18.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -413,7 +413,7 @@ xrdp:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/xrdp
-    tag: v2.17.3
+    tag: v2.18.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -488,7 +488,7 @@ web:
   image:
     registry: docker.io
     repository: jumpserver/web
-    tag: v2.17.3
+    tag: v2.18.0
     pullPolicy: IfNotPresent
 
   command: []