From 40e8925f9ce1e1bc548a9fa6fc9a9a6e7886d4fe Mon Sep 17 00:00:00 2001 From: wojiushixiaobai <296015668@qq.com> Date: Wed, 17 Nov 2021 14:40:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E5=B1=80=20tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/_images.tpl | 5 ++++- values.yaml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/_images.tpl b/templates/_images.tpl index 4beb586..00c457b 100644 --- a/templates/_images.tpl +++ b/templates/_images.tpl @@ -10,6 +10,9 @@ Return the proper image name {{- if .global.imageRegistry }} {{- $registryName = .global.imageRegistry -}} {{- end -}} +{{- if .global.imageTag }} +{{- $tag = .global.imageTag -}} +{{- end -}} {{- end -}} {{- if $registryName }} {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} @@ -86,4 +89,4 @@ imagePullSecrets: - name: {{ . }} {{- end }} {{- end }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/values.yaml b/values.yaml index c253c71..466f18b 100644 --- a/values.yaml +++ b/values.yaml @@ -12,6 +12,7 @@ fullnameOverride: "" ## global: imageRegistry: "docker.io" + imageTag: v2.15.4 ## E.g. # imagePullSecrets: # - myRegistryKeySecretName From 4b2ca8414fcbbb8be0ee205b736710f207cbab40 Mon Sep 17 00:00:00 2001 From: wojiushixiaobai <296015668@qq.com> Date: Wed, 17 Nov 2021 16:29:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E6=8B=86=E5=88=86=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/NOTES.txt | 5 ++-- ...ervice-koko.yaml => service-koko-ssh.yaml} | 8 ++--- templates/koko/service-koko-web.yaml | 29 +++++++++++++++++++ values.yaml | 4 ++- 4 files changed, 37 insertions(+), 9 deletions(-) rename templates/koko/{service-koko.yaml => service-koko-ssh.yaml} (84%) create mode 100644 templates/koko/service-koko-web.yaml diff --git a/templates/NOTES.txt b/templates/NOTES.txt index 933c90d..9ba1b5d 100644 --- a/templates/NOTES.txt +++ b/templates/NOTES.txt @@ -2,10 +2,11 @@ {{- if .Values.ingress.enabled }} {{- range $host := .Values.ingress.hosts }} http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }} + username: admin password: admin {{- end }} {{- end }} +{{- if eq .Values.koko.service.ssh.type "LoadBalancer" }} 2. Access the Jumpserver SSH server by running these commands: -{{- if eq .Values.koko.service.type "LoadBalancer" }} - ssh -p{{ .Values.koko.service.ssh.port }} admin@{{ .Values.koko.service.loadBalancerIP }} + ssh -p{{ .Values.koko.service.ssh.port }} admin@{{ .Values.koko.service.ssh.loadBalancerIP }} {{- end }} diff --git a/templates/koko/service-koko.yaml b/templates/koko/service-koko-ssh.yaml similarity index 84% rename from templates/koko/service-koko.yaml rename to templates/koko/service-koko-ssh.yaml index 268bd1d..8b4c257 100644 --- a/templates/koko/service-koko.yaml +++ b/templates/koko/service-koko-ssh.yaml @@ -1,6 +1,6 @@ {{- if .Values.koko.enabled }} {{- with .Values.koko }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko" }} +{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko-ssh" }} apiVersion: v1 kind: Service metadata: @@ -11,12 +11,8 @@ metadata: annotations: {{- toYaml .service.annotations | nindent 4 }} spec: - type: {{ .service.type }} + type: {{ .service.ssh.type }} ports: - - port: {{ .service.web.port }} - targetPort: web - protocol: TCP - name: web - port: {{ .service.ssh.port }} targetPort: ssh protocol: TCP diff --git a/templates/koko/service-koko-web.yaml b/templates/koko/service-koko-web.yaml new file mode 100644 index 0000000..9e12a4e --- /dev/null +++ b/templates/koko/service-koko-web.yaml @@ -0,0 +1,29 @@ +{{- if .Values.koko.enabled }} +{{- with .Values.koko }} +{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko-web" }} +apiVersion: v1 +kind: Service +metadata: + name: {{ $fullName }} + labels: + {{- include "jumpserver.labels" $ | nindent 4 }} + {{- toYaml .labels | nindent 4 }} + annotations: + {{- toYaml .service.annotations | nindent 4 }} +spec: + type: {{ .service.web.type }} + ports: + - port: {{ .service.web.port }} + targetPort: web + protocol: TCP + name: web + sessionAffinity: ClientIP + sessionAffinityConfig: + clientIP: + timeoutSeconds: 10800 + selector: + app.kubernetes.io/name: {{ include "jumpserver.name" $ }} + app.kubernetes.io/instance: {{ $.Release.Name }} + {{- toYaml .labels | nindent 4 }} +{{- end }} +{{- end }} diff --git a/values.yaml b/values.yaml index 466f18b..388dbef 100644 --- a/values.yaml +++ b/values.yaml @@ -202,10 +202,12 @@ koko: # runAsUser: 1000 service: - type: ClusterIP web: + type: ClusterIP port: 5000 ssh: + type: ClusterIP + # loadBalancerIP: port: 2222 resources: {} From 1217d1963a0f80f6776e7ac66a7cb08ee552bcd3 Mon Sep 17 00:00:00 2001 From: wojiushixiaobai <296015668@qq.com> Date: Thu, 18 Nov 2021 20:15:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20v2.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- .helmignore | 1 + Chart.yaml | 2 +- values.yaml | 14 +++++++------- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ba20a15..6b48ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **/values-debug.yaml -deploy.sh \ No newline at end of file +.idea/ +deploy.sh diff --git a/.helmignore b/.helmignore index 50af031..9beddef 100644 --- a/.helmignore +++ b/.helmignore @@ -10,6 +10,7 @@ .hg/ .hgignore .svn/ +.idea/ # Common backup files *.swp *.bak diff --git a/Chart.yaml b/Chart.yaml index 3d1837c..7273f04 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "v2.15.4" +appVersion: "v2.16.0" description: A Helm chart for Deploying Jumpserver on Kubernetes name: jumpserver version: 0.1.0 diff --git a/values.yaml b/values.yaml index 388dbef..cf5e570 100644 --- a/values.yaml +++ b/values.yaml @@ -12,7 +12,7 @@ fullnameOverride: "" ## global: imageRegistry: "docker.io" - imageTag: v2.15.4 + imageTag: v2.16.0 ## E.g. # imagePullSecrets: # - myRegistryKeySecretName @@ -85,7 +85,7 @@ core: image: registry: docker.io repository: jumpserver/core - tag: v2.15.4 + tag: v2.16.0 pullPolicy: IfNotPresent command: [] @@ -170,7 +170,7 @@ koko: image: registry: docker.io repository: jumpserver/koko - tag: v2.15.4 + tag: v2.16.0 pullPolicy: IfNotPresent command: [] @@ -256,7 +256,7 @@ lion: image: registry: docker.io repository: jumpserver/lion - tag: v2.15.4 + tag: v2.16.0 pullPolicy: IfNotPresent command: [] @@ -338,7 +338,7 @@ omnidb: image: registry: registry.fit2cloud.com repository: jumpserver/omnidb - tag: v2.15.4 + tag: v2.16.0 pullPolicy: IfNotPresent command: [] @@ -417,7 +417,7 @@ xrdp: image: registry: registry.fit2cloud.com repository: jumpserver/xrdp - tag: v2.15.4 + tag: v2.16.0 pullPolicy: IfNotPresent command: [] @@ -492,7 +492,7 @@ web: image: registry: docker.io repository: jumpserver/web - tag: v2.15.4 + tag: v2.16.0 pullPolicy: IfNotPresent command: []