feat: 更新 v3.0.0

charts/jumpserver/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.28.7"
+appVersion: "v3.0.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.28.7
+version: 3.0.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.28.7  ` |
+| `global.imageTag`         | 版本号             | `v3.0.0  ` |
 | `global.imagePullSecrets` | 私有仓库认证凭据    | `nil`       |
 | `global.storageClass`     | 存储 sc            | `nil`       |
 | `ingress.enabled`         | 开启 ingress       | `true`      |

charts/jumpserver/templates/_helpers.tpl

@@ -173,21 +173,37 @@ Define JumpServer StorageClass.
 Define JumpServer magnus ports.
 */}}
 
-{{- define "jumpserver.magnus.ports" -}}
+{{- define "jumpserver.magnus.mysql.port" -}}
+{{- default 33061 .Values.magnus.service.mysql.port -}}
+{{- end -}}
+
+{{- define "jumpserver.magnus.mariadb.port" -}}
+{{- default 33062 .Values.magnus.service.mariadb.port -}}
+{{- end -}}
+
+{{- define "jumpserver.magnus.redis.port" -}}
+{{- default 63790 .Values.magnus.service.redis.port -}}
+{{- end -}}
+
+{{- define "jumpserver.magnus.postgresql.port" -}}
+{{- default 54320 .Values.magnus.service.postgresql.port -}}
+{{- end -}}
+
+{{- define "jumpserver.magnus.oracle.ports" -}}
 {{- default "30000-30100" .Values.magnus.service.ports -}}
 {{- end -}}
 
-{{- define "jumpserver.magnus.port.start" -}}
+{{- define "jumpserver.magnus.oracle.port.start" -}}
-{{- if .Values.magnus.service.ports }}
+{{- if .Values.magnus.service.oracle.ports }}
-{{- .Values.magnus.service.ports | splitList "-" | first }}
+{{- .Values.magnus.service.oracle.ports | splitList "-" | first }}
 {{- else -}}
 {{- default 30000 -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "jumpserver.magnus.port.end" -}}
+{{- define "jumpserver.magnus.oracle.port.end" -}}
-{{- if .Values.magnus.service.ports }}
+{{- if .Values.magnus.service.oracle.ports }}
-{{- add (.Values.magnus.service.ports | splitList "-" | last) 1 }}
+{{- add (.Values.magnus.service.oracle.ports | splitList "-" | last) 1 }}
 {{- else -}}
 {{- default 30101 -}}
 {{- end -}}

charts/jumpserver/templates/celery/deployment-celery.yaml

@@ -3,7 +3,11 @@
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-celery" }}
 {{- $containerName := "jms-celery" }}
 {{- $image := printf "%s" (include "jumpserver.coreImage" $) }}
-{{- $magnusPorts := printf "%s" (include "jumpserver.magnus.ports" $) }}
+{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
+{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
+{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
+{{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
+{{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -73,8 +77,16 @@ spec:
               value: {{ include "jumpserver.redis.port" $ | quote }}
             - name: REDIS_PASSWORD
               value: {{ include "jumpserver.redis.password" $ | quote }}
-            - name: MAGNUS_PORTS
+            - name: MAGNUS_MYSQL_PORT
-              value: {{ $magnusPorts | quote }}
+              value: {{ $mysqlPort | quote }}
+            - name: MAGNUS_MARIADB_PORT
+              value: {{ $mariadbPort | quote }}
+            - name: MAGNUS_REDIS_PORT
+              value: {{ $redisPort | quote }}
+            - name: MAGNUS_POSTGRESQL_PORT
+              value: {{ $postgresqlPort | quote }}
+            - name: MAGNUS_ORACLE_PORTS
+              value: {{ $oraclePorts | quote }}
             {{- range $key, $val := .env }}
             - name: {{ $key }}
               value: {{ $val | quote }}

charts/jumpserver/templates/core/deployment-core.yaml

@@ -3,7 +3,11 @@
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-core" }}
 {{- $containerName := "jms-core" }}
 {{- $image := printf "%s" (include "jumpserver.coreImage" $) }}
-{{- $magnusPorts := printf "%s" (include "jumpserver.magnus.ports" $) }}
+{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
+{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
+{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
+{{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
+{{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -74,8 +78,16 @@ spec:
               value: {{ include "jumpserver.redis.port" $ | quote }}
             - name: REDIS_PASSWORD
               value: {{ include "jumpserver.redis.password" $ | quote }}
-            - name: MAGNUS_PORTS
+            - name: MAGNUS_MYSQL_PORT
-              value: {{ $magnusPorts | quote }}
+              value: {{ $mysqlPort | quote }}
+            - name: MAGNUS_MARIADB_PORT
+              value: {{ $mariadbPort | quote }}
+            - name: MAGNUS_REDIS_PORT
+              value: {{ $redisPort | quote }}
+            - name: MAGNUS_POSTGRESQL_PORT
+              value: {{ $postgresqlPort | quote }}
+            - name: MAGNUS_ORACLE_PORTS
+              value: {{ $oraclePorts | quote }}
             {{- range $key, $val := .env }}
             - name: {{ $key }}
               value: {{ $val | quote }}

charts/jumpserver/templates/magnus/deployment-magnus.yaml

@@ -3,8 +3,13 @@
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-magnus" }}
 {{- $containerName := "jms-magnus" }}
 {{- $image := printf "%s" (include "jumpserver.magnusImage" $) }}
-{{- $magnusPortStart := printf "%s" (include "jumpserver.magnus.port.start" $) | int }}
+{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
-{{- $magnusPortEnd := printf "%s" (include "jumpserver.magnus.port.end" $) | int }}
+{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
+{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
+{{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
+{{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }}
+{{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }}
+{{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -50,13 +55,35 @@ spec:
               value: {{ $.Values.core.config.bootstrapToken | quote }}
             - name: LOG_LEVEL
               value: {{ .config.log.level | quote }}
+            - name: MAGNUS_MYSQL_PORT
+              value: {{ $mysqlPort | quote }}
+            - name: MAGNUS_MARIADB_PORT
+              value: {{ $mariadbPort | quote }}
+            - name: MAGNUS_REDIS_PORT
+              value: {{ $redisPort | quote }}
+            - name: MAGNUS_POSTGRESQL_PORT
+              value: {{ $postgresqlPort | quote }}
+            - name: MAGNUS_ORACLE_PORTS
+              value: {{ $oraclePorts | quote }}
             {{- range $key, $val := .env }}
             - name: {{ $key }}
               value: {{ $val | quote }}
             {{- end }}
           ports:
-            {{- range $port := untilStep $magnusPortStart $magnusPortEnd 1 }}
+            - name: mysql
-            - name: magnus-{{ $port }}
+              containerPort: {{ $mysqlPort }}
+              protocol: TCP
+            - name: mariadb
+              containerPort: {{ $mariadbPort }}
+              protocol: TCP
+            - name: redis
+              containerPort: {{ $redisPort }}
+              protocol: TCP
+            - name: postgresql
+              containerPort: {{ $postgresqlPort }}
+              protocol: TCP
+            {{- range $port := untilStep $oraclePortStart $oraclePortEnd 1 }}
+            - name: oracle-{{ $port }}
               containerPort: {{ $port }}
               protocol: TCP
             {{- end }}

charts/jumpserver/templates/magnus/service-magnus.yaml

@@ -1,8 +1,12 @@
 {{- if .Values.magnus.enabled }}
 {{- with .Values.magnus }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-magnus" }}
-{{- $magnusPortStart := printf "%s" (include "jumpserver.magnus.port.start" $) | int }}
+{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
-{{- $magnusPortEnd := printf "%s" (include "jumpserver.magnus.port.end" $) | int}}
+{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
+{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
+{{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
+{{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }}
+{{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,14 +19,32 @@ metadata:
 spec:
   type: {{ .service.type }}
   ports:
-    {{- range $port := untilStep $magnusPortStart $magnusPortEnd 1 }}
+    - port: {{ .service.mysql.port }}
+      targetPort: mysql
+      protocol: TCP
+      name: mysql
+    - port: {{ .service.mariadb.port }}
+      targetPort: mariadb
+      protocol: TCP
+      name: mariadb
+    - port: {{ .service.redis.port }}
+      targetPort: redis
+      protocol: TCP
+      name: redis
+    {{- if $.Values.xpack.enabled }}
+    - port: {{ .service.postgresql.port }}
+      targetPort: postgresql
+      protocol: TCP
+      name: postgresql
+    {{- range $port := untilStep $oraclePortStart $oraclePortEnd 1 }}
     - port: {{ $port }}
       {{- if eq $.Values.magnus.service.type "NodePort" }}
       nodePort: {{ $port }}
       {{- end }}
-      targetPort: magnus-{{ $port }}
+      targetPort: oracle-{{ $port }}
       protocol: TCP
-      name: magnus-{{ $port }}
+      name: oracle-{{ $port }}
+    {{- end }}
     {{- end }}
   sessionAffinity: ClientIP
   sessionAffinityConfig:

charts/jumpserver/values.yaml

@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 global:
   imageRegistry: "docker.io"
-  imageTag: v2.28.7
+  imageTag: v3.0.0
   ## E.g.
   #  imagePullSecrets:
   #  - myRegistryKeySecretName
@@ -85,7 +85,7 @@ core:
   image:
     registry: docker.io
     repository: jumpserver/core
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -174,7 +174,7 @@ koko:
   image:
     registry: docker.io
     repository: jumpserver/koko
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -265,7 +265,7 @@ lion:
   image:
     registry: docker.io
     repository: jumpserver/lion
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -356,7 +356,7 @@ magnus:
   image:
     registry: docker.io
     repository: jumpserver/magnus
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -386,7 +386,16 @@ magnus:
 
   service:
     type: ClusterIP
-    ports: 30000-30100
+    mysql:
+      port: 33061
+    mariadb:
+      port: 33062
+    redis:
+      port: 63790
+    postgresql:
+      port: 54320
+    oracle:
+      ports: 30000-30100
 
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
@@ -437,7 +446,7 @@ omnidb:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/omnidb
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -516,7 +525,7 @@ razor:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/razor
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -593,7 +602,7 @@ web:
   image:
     registry: docker.io
     repository: jumpserver/web
-    tag: v2.28.7
+    tag: v3.0.0
     pullPolicy: IfNotPresent
 
   command: []