Merge pull request #78 from wojiushixiaobai/main

feat: 更新 v2.22.2
2025-08-22 00:43:03 +00:00 · 2022-06-08 15:56:16 +08:00 · 2022-06-08 15:56:16 +08:00 · 1d78dbc785
commit 1d78dbc785
parent b6e855d099 9b87d5c149
11 changed files with 93 additions and 12 deletions
--- a/charts/jumpserver/Chart.yaml
+++ b/charts/jumpserver/Chart.yaml
@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.22.1"
+appVersion: "v2.22.2"
 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.22.1
+version: 2.22.2
--- 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.22.1  ` |
+| `global.imageTag`         | 版本号             | `v2.22.2  ` |
 | `global.imagePullSecrets` | 私有仓库认证凭据    | `nil`       |
 | `global.storageClass`     | 存储 sc            | `nil`       |
 | `ingress.enabled`         | 开启 ingress       | `true`      |
--- a/charts/jumpserver/templates/celery/deployment-celery.yaml
+++ b/charts/jumpserver/templates/celery/deployment-celery.yaml
@ -89,8 +89,14 @@ spec:
              subPath: "config.yml"
            - mountPath: "/opt/jumpserver/data"
              name: "jms-core-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
            - mountPath: "/opt/jumpserver/logs"
              name: "jms-core-logs"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
@ -100,7 +106,11 @@ spec:
            name: '{{ include "jumpserver.fullname" $ }}-jms-core'
          name: "jms-core-config"
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            {{- end }}
          name: "jms-core-data"
        - persistentVolumeClaim:
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-logs'
--- a/charts/jumpserver/templates/core/deployment-core.yaml
+++ b/charts/jumpserver/templates/core/deployment-core.yaml
@ -96,8 +96,14 @@ spec:
              subPath: "config.yml"
            - mountPath: "/opt/jumpserver/data"
              name: "jms-core-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
            - mountPath: "/opt/jumpserver/logs"
              name: "jms-core-logs"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
@ -107,7 +113,11 @@ spec:
            name: '{{ include "jumpserver.fullname" $ }}-jms-core'
          name: "jms-core-config"
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            {{- end }}
          name: "jms-core-data"
        - persistentVolumeClaim:
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-logs'
--- a/charts/jumpserver/templates/koko/deployment-koko.yaml
+++ b/charts/jumpserver/templates/koko/deployment-koko.yaml
@ -82,13 +82,20 @@ spec:
          volumeMounts:
            - mountPath: "/opt/koko/data"
              name: "jms-koko-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
      restartPolicy: Always
      volumes:
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-koko-data'
+            {{- end }}
          name: "jms-koko-data"
      {{- with .volumes }}
        {{- tpl (toYaml .) $ | nindent 8 }}
--- a/charts/jumpserver/templates/lion/deployment-lion.yaml
+++ b/charts/jumpserver/templates/lion/deployment-lion.yaml
@ -75,13 +75,20 @@ spec:
          volumeMounts:
            - mountPath: "/opt/lion/data"
              name: "jms-lion-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
      restartPolicy: Always
      volumes:
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-lion-data'
+            {{- end }}
          name: "jms-lion-data"
      {{- with .volumes }}
        {{- tpl (toYaml .) $ | nindent 8 }}
--- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@ -73,13 +73,20 @@ spec:
          volumeMounts:
            - mountPath: "/opt/magnus/data"
              name: "jms-magnus-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
      restartPolicy: Always
      volumes:
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-magnus-data'
+            {{- end }}
          name: "jms-magnus-data"
      {{- with .volumes }}
        {{- tpl (toYaml .) $ | nindent 8 }}
--- a/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
+++ b/charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
@ -67,13 +67,20 @@ spec:
          volumeMounts:
            - mountPath: "/opt/omnidb/data"
              name: "jms-omnidb-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
      restartPolicy: Always
      volumes:
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-omnidb-data'
+            {{- end }}
          name: "jms-omnidb-data"
      {{- with .volumes }}
        {{- tpl (toYaml .) $ | nindent 8 }}
--- a/charts/jumpserver/templates/web/deployment-nginx.yaml
+++ b/charts/jumpserver/templates/web/deployment-nginx.yaml
@ -62,8 +62,14 @@ spec:
              subPath: "default.conf"
            - mountPath: "/opt/jumpserver/data"
              name: "jms-core-data"
+              {{- if $.Values.core.persistence.subPath }}
+              subPath: {{ $.Values.core.persistence.subPath | quote }}
+              {{- end }}
            - mountPath: "/var/log/nginx"
              name: "jms-web-logs"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
@ -73,10 +79,18 @@ spec:
            name: '{{ include "jumpserver.fullname" $ }}-jms-web'
          name: "jms-web-config"
        - persistentVolumeClaim:
+            {{- if $.Values.core.persistence.existingClaim }}
+            claimName: {{ $.Values.core.persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            {{- end }}
          name: "jms-core-data"
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-web-logs'
+            {{- end }}
          name: "jms-web-logs"
      {{- with .volumes }}
        {{- tpl (toYaml .) $ | nindent 8 }}
--- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
+++ b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
@ -67,13 +67,20 @@ spec:
          volumeMounts:
            - mountPath: "/opt/xrdp/data"
              name: "jms-xrdp-data"
+              {{- if .persistence.subPath }}
+              subPath: {{ .persistence.subPath | quote }}
+              {{- end }}
          {{- with .volumeMounts }}
            {{- toYaml . | nindent 12 }}
          {{- end }}
      restartPolicy: Always
      volumes:
        - persistentVolumeClaim:
+            {{- if .persistence.existingClaim }}
+            claimName: {{ .persistence.existingClaim | quote }}
+            {{- else }}
            claimName: '{{ include "jumpserver.fullname" $ }}-jms-xrdp-data'
+            {{- end }}
          name: "jms-xrdp-data"
      {{- with .volumes }}
        {{- tpl (toYaml .) $ | nindent 8 }}
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 global:
  imageRegistry: "docker.io"
-  imageTag: v2.22.1
+  imageTag: v2.22.2
  ## E.g.
  #  imagePullSecrets:
  #  - myRegistryKeySecretName
@ -85,7 +85,7 @@ core:
  image:
    registry: docker.io
    repository: jumpserver/core
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -147,7 +147,7 @@ core:
    finalizers:
      - kubernetes.io/pvc-protection
    # subPath: ""
-    # existingClaim:
+    # existingClaim: ""

  volumeMounts: []

@ -174,7 +174,7 @@ koko:
  image:
    registry: docker.io
    repository: jumpserver/koko
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -237,6 +237,8 @@ koko:
    # annotations: {}
    finalizers:
      - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""

  volumeMounts: []

@ -263,7 +265,7 @@ lion:
  image:
    registry: docker.io
    repository: jumpserver/lion
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -326,6 +328,8 @@ lion:
    # annotations: {}
    finalizers:
      - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""

  volumeMounts: []

@ -352,7 +356,7 @@ magnus:
  image:
    registry: docker.io
    repository: jumpserver/magnus
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -409,6 +413,8 @@ magnus:
    # annotations: {}
    finalizers:
      - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""

  volumeMounts: []

@ -436,7 +442,7 @@ omnidb:
  image:
    registry: registry.fit2cloud.com
    repository: jumpserver/omnidb
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -489,6 +495,8 @@ omnidb:
    # annotations: {}
    finalizers:
      - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""

  volumeMounts: []

@ -513,7 +521,7 @@ xrdp:
  image:
    registry: registry.fit2cloud.com
    repository: jumpserver/xrdp
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -575,6 +583,8 @@ xrdp:
    # annotations: {}
    finalizers:
      - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""

  volumeMounts: []

@ -597,7 +607,7 @@ web:
  image:
    registry: docker.io
    repository: jumpserver/web
-    tag: v2.22.1
+    tag: v2.22.2
    pullPolicy: IfNotPresent

  command: []
@ -654,6 +664,8 @@ web:
    # annotations: {}
    finalizers:
      - kubernetes.io/pvc-protection
+    # subPath: ""
+    # existingClaim: ""

  volumeMounts: []