Merge pull request #29 from wojiushixiaobai/main

feat: 更新 v2.16.0

.gitignore

@@ -1,2 +1,3 @@
 **/values-debug.yaml
-deploy.sh
+.idea/
+deploy.sh

.helmignore

@@ -10,6 +10,7 @@
 .hg/
 .hgignore
 .svn/
+.idea/
 # Common backup files
 *.swp
 *.bak

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

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

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

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

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

values.yaml

@@ -12,6 +12,7 @@ fullnameOverride: ""
 ##
 global:
   imageRegistry: "docker.io"
+  imageTag: v2.16.0
   ## E.g.
   #  imagePullSecrets:
   #  - myRegistryKeySecretName
@@ -84,7 +85,7 @@ core:
   image:
     registry: docker.io
     repository: jumpserver/core
-    tag: v2.15.4
+    tag: v2.16.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -169,7 +170,7 @@ koko:
   image:
     registry: docker.io
     repository: jumpserver/koko
-    tag: v2.15.4
+    tag: v2.16.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -201,10 +202,12 @@ koko:
     # runAsUser: 1000
 
   service:
-    type: ClusterIP
     web:
+      type: ClusterIP
       port: 5000
     ssh:
+      type: ClusterIP
+      # loadBalancerIP:
       port: 2222
 
   resources: {}
@@ -253,7 +256,7 @@ lion:
   image:
     registry: docker.io
     repository: jumpserver/lion
-    tag: v2.15.4
+    tag: v2.16.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -335,7 +338,7 @@ omnidb:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/omnidb
-    tag: v2.15.4
+    tag: v2.16.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -414,7 +417,7 @@ xrdp:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/xrdp
-    tag: v2.15.4
+    tag: v2.16.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -489,7 +492,7 @@ web:
   image:
     registry: docker.io
     repository: jumpserver/web
-    tag: v2.15.4
+    tag: v2.16.0
     pullPolicy: IfNotPresent
 
   command: []