From c5b8634d362f591bb9e8c82dcaea0657dcbb0f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Fri, 21 Oct 2022 14:03:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20v2.27.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 | 5 ++- charts/jumpserver/templates/_helpers.tpl | 32 +++++++++++-- .../templates/celery/deployment-celery.yaml | 3 ++ .../templates/core/deployment-core.yaml | 3 ++ .../templates/magnus/deployment-magnus.yaml | 39 ++++++++-------- .../templates/magnus/service-magnus.yaml | 30 +++---------- charts/jumpserver/values.yaml | 45 +++++++------------ 8 files changed, 81 insertions(+), 80 deletions(-) diff --git a/charts/jumpserver/Chart.yaml b/charts/jumpserver/Chart.yaml index 683284a..53a267f 100644 --- a/charts/jumpserver/Chart.yaml +++ b/charts/jumpserver/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "v2.26.1" +appVersion: "v2.27.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.26.1 +version: 2.27.0 diff --git a/charts/jumpserver/README.md b/charts/jumpserver/README.md index 29e7b1a..2aa99a6 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.26.1 ` | +| `global.imageTag` | 版本号 | `v2.27.0 ` | | `global.imagePullSecrets` | 私有仓库认证凭据 | `nil` | | `global.storageClass` | 存储 sc | `nil` | | `ingress.enabled` | 开启 ingress | `true` | @@ -45,6 +45,7 @@ helm repo add jumpserver https://jumpserver.github.io/helm-charts | 参数 | 描述 | 默认值 | | ------------------------------ | ---------------------------------------------| ---------------------- | +| `global.storageClass` | 持久化存储 | `nil` | | `core.config.secretKey` | 加密秘钥 生产环境中请修改为随机字符串，请勿外泄 | `nil` | | `core.config.bootstrapToken` | 预共享 Token 组件注册需要使用 | `nil` | | `externalDatabase.engine` | 数据库引擎 | `mysql` | @@ -83,7 +84,7 @@ helm install jumpserver ./ \ helm install jms-k8s jumpserver/jumpserver -n default \ --set core.config.secretKey=GxrLH7rewfsRN8B9Zl6MEGD50Uou4LF6UVsEIayGMhYll8dqmn \ --set core.config.bootstrapToken=ilR8RvAbK7lgRTxs \ ---set global.storageClass=nfs \ +--set global.storageClass=jms-data \ --set externalDatabase.engine=mysql \ --set externalDatabase.host=jms-mysql \ --set externalDatabase.port=3306 \ diff --git a/charts/jumpserver/templates/_helpers.tpl b/charts/jumpserver/templates/_helpers.tpl index 4169cb7..2f6cea8 100644 --- a/charts/jumpserver/templates/_helpers.tpl +++ b/charts/jumpserver/templates/_helpers.tpl @@ -56,7 +56,7 @@ Create the name of the service account to use {{- end -}} {{/* -Define JumpServer database +Define JumpServer database. */}} {{- define "jumpserver.mysql.fullname" -}} @@ -89,7 +89,7 @@ Define JumpServer database {{- end -}} {{/* -Define JumpServer redis +Define JumpServer redis. */}} {{- define "jumpserver.redis.fullname" -}} @@ -110,7 +110,7 @@ Define JumpServer redis {{- end -}} {{/* -Define JumpServer StorageClass +Define JumpServer StorageClass. */}} {{- define "jumpserver.core.storageClass" -}} @@ -165,6 +165,30 @@ Define JumpServer StorageClass {{- if .Values.global.storageClass }} {{- .Values.global.storageClass }} {{- else -}} -{{- .Values.razor.persistence.storageClassName -}} +{{- .Values.web.persistence.storageClassName -}} +{{- end -}} +{{- end -}} + +{{/* +Define JumpServer magnus ports. +*/}} + +{{- define "jumpserver.magnus.ports" -}} +{{- default "30000-30100" .Values.magnus.service.ports -}} +{{- end -}} + +{{- define "jumpserver.magnus.port.start" -}} +{{- if .Values.magnus.service.ports }} +{{- .Values.magnus.service.ports | splitList "-" | first }} +{{- else -}} +{{- default 30000 -}} +{{- end -}} +{{- end -}} + +{{- define "jumpserver.magnus.port.end" -}} +{{- if .Values.magnus.service.ports }} +{{- add (.Values.magnus.service.ports | splitList "-" | last) 1 }} +{{- else -}} +{{- default 30101 -}} {{- end -}} {{- end -}} diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml index 988cc83..d008850 100644 --- a/charts/jumpserver/templates/celery/deployment-celery.yaml +++ b/charts/jumpserver/templates/celery/deployment-celery.yaml @@ -3,6 +3,7 @@ {{- $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" $) }} apiVersion: apps/v1 kind: Deployment metadata: @@ -72,6 +73,8 @@ spec: value: {{ include "jumpserver.redis.port" $ | quote }} - name: REDIS_PASSWORD value: {{ include "jumpserver.redis.password" $ | quote }} + - name: MAGNUS_PORTS + value: {{ $magnusPorts | quote }} {{- range $key, $val := .env }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml index 544b512..04fdf17 100644 --- a/charts/jumpserver/templates/core/deployment-core.yaml +++ b/charts/jumpserver/templates/core/deployment-core.yaml @@ -3,6 +3,7 @@ {{- $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" $) }} apiVersion: apps/v1 kind: Deployment metadata: @@ -73,6 +74,8 @@ spec: value: {{ include "jumpserver.redis.port" $ | quote }} - name: REDIS_PASSWORD value: {{ include "jumpserver.redis.password" $ | quote }} + - name: MAGNUS_PORTS + value: {{ $magnusPorts | quote }} {{- range $key, $val := .env }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml index bd590f9..bd41d1f 100644 --- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml +++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml @@ -3,6 +3,8 @@ {{- $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 }} +{{- $magnusPortEnd := printf "%s" (include "jumpserver.magnus.port.end" $) | int }} apiVersion: apps/v1 kind: Deployment metadata: @@ -53,30 +55,27 @@ spec: value: {{ $val | quote }} {{- end }} ports: - - name: mysql - containerPort: {{ .service.mysql.port }} - protocol: TCP - - 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 }} - protocol: TCP - - name: oracle11g - containerPort: {{ .service.oracle11g.port }} - protocol: TCP - - name: oracle12c - containerPort: {{ .service.oracle12c.port }} + {{- range $port := untilStep $magnusPortStart $magnusPortEnd 1 }} + - name: magnus-{{ $port }} + containerPort: {{ $port }} protocol: TCP {{- end }} livenessProbe: - {{- toYaml .livenessProbe | nindent 12}} + {{- if .livenessProbe }} + {{- toYaml .livenessProbe | nindent 12 }} + {{- else }} + failureThreshold: 30 + tcpSocket: + port: magnus-{{ template "jumpserver.magnus.port.start" }} + {{- end }} readinessProbe: - {{- toYaml .readinessProbe | nindent 12}} + {{- if .readinessProbe }} + {{- toYaml .readinessProbe | nindent 12 }} + {{- else }} + failureThreshold: 30 + tcpSocket: + port: magnus-{{ template "jumpserver.magnus.port.start" }} + {{- end }} resources: {{- toYaml .resources | nindent 12 }} volumeMounts: diff --git a/charts/jumpserver/templates/magnus/service-magnus.yaml b/charts/jumpserver/templates/magnus/service-magnus.yaml index e52b905..85dc245 100644 --- a/charts/jumpserver/templates/magnus/service-magnus.yaml +++ b/charts/jumpserver/templates/magnus/service-magnus.yaml @@ -1,6 +1,8 @@ {{- 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 }} +{{- $magnusPortEnd := printf "%s" (include "jumpserver.magnus.port.end" $) | int}} apiVersion: v1 kind: Service metadata: @@ -13,31 +15,11 @@ metadata: spec: type: {{ .service.type }} ports: - - port: {{ .service.mysql.port }} - targetPort: mysql + {{- range $port := untilStep $magnusPortStart $magnusPortEnd 1 }} + - port: {{ $port }} + targetPort: magnus-{{ $port }} 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.postgre.port }} - targetPort: postgre - protocol: TCP - name: postgre - - port: {{ .service.oracle11g.port }} - targetPort: oracle11g - protocol: TCP - name: oracle11g - - port: {{ .service.oracle12c.port }} - targetPort: oracle12c - protocol: TCP - name: oracle12c + name: magnus-{{ $port }} {{- end }} sessionAffinity: ClientIP sessionAffinityConfig: diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml index 90621e3..de5ae9d 100644 --- a/charts/jumpserver/values.yaml +++ b/charts/jumpserver/values.yaml @@ -12,7 +12,7 @@ fullnameOverride: "" ## global: imageRegistry: "docker.io" - imageTag: v2.26.1 + imageTag: v2.27.0 ## E.g. # imagePullSecrets: # - myRegistryKeySecretName @@ -85,7 +85,7 @@ core: image: registry: docker.io repository: jumpserver/core - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: [] @@ -174,7 +174,7 @@ koko: image: registry: docker.io repository: jumpserver/koko - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: [] @@ -265,7 +265,7 @@ lion: image: registry: docker.io repository: jumpserver/lion - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: [] @@ -356,22 +356,22 @@ magnus: image: registry: docker.io repository: jumpserver/magnus - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: [] env: [] - livenessProbe: - failureThreshold: 30 - tcpSocket: - port: mysql + livenessProbe: {} + # failureThreshold: 30 + # tcpSocket: + # port: 30000 - readinessProbe: - failureThreshold: 30 - tcpSocket: - port: mysql + readinessProbe: {} + # failureThreshold: 30 + # tcpSocket: + # port: 30000 podSecurityContext: {} # fsGroup: 2000 @@ -386,18 +386,7 @@ magnus: service: type: ClusterIP - mysql: - port: 33060 - mariadb: - port: 33061 - redis: - port: 63790 - postgre: - port: 54320 - oracle11g: - port: 15211 - oracle12c: - port: 15212 + ports: 30000-30100 resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -448,7 +437,7 @@ omnidb: image: registry: registry.fit2cloud.com repository: jumpserver/omnidb - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: [] @@ -527,7 +516,7 @@ razor: image: registry: registry.fit2cloud.com repository: jumpserver/razor - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: [] @@ -604,7 +593,7 @@ web: image: registry: docker.io repository: jumpserver/web - tag: v2.26.1 + tag: v2.27.0 pullPolicy: IfNotPresent command: []