github/jumpserver-charts
1
0
Fork 0
mirror of https://github.com/jumpserver/helm-charts.git synced 2025-08-21 00:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52 from wojiushixiaobai/main

Browse Source 
feat: 更新 v2.18.0
This commit is contained in:
吴小白 2022-01-20 17:39:35 +08:00 committed by GitHub
commit 79dfb24746
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/jumpserver/Chart.yaml
View File

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

2
charts/jumpserver/README.md
View File

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

12
charts/jumpserver/templates/_helpers.tpl
View File

@ -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 -}}
{{- end -}}

20
charts/jumpserver/templates/celery/deployment-celery.yaml
View File

@ -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 }}
@ -123,3 +122,4 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}

22
charts/jumpserver/templates/core/deployment-core.yaml
View File

@ -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 }}

12
charts/jumpserver/templates/koko/deployment-koko.yaml
View File

@ -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
@ -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 }}

12
charts/jumpserver/templates/lion/deployment-lion.yaml
View File

@ -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
@ -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 }}

2
charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
View File

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

22
charts/jumpserver/templates/pre-install-initdb.yaml
View File

@ -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
restartPolicy: Never
{{- end }}

2
charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
View File

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

14
charts/jumpserver/values.yaml
View File

@ -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: []