Merge pull request #88 from wojiushixiaobai/main

feat: 更新 v2.24.0

charts/jumpserver/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.23.4"
+appVersion: "v2.24.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.23.4
+version: 2.24.0

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.23.4  ` |
+| `global.imageTag`         | 版本号             | `v2.24.0  ` |
 | `global.imagePullSecrets` | 私有仓库认证凭据    | `nil`       |
 | `global.storageClass`     | 存储 sc            | `nil`       |
 | `ingress.enabled`         | 开启 ingress       | `true`      |

charts/jumpserver/templates/magnus/deployment-magnus.yaml

@@ -63,6 +63,12 @@ spec:
             - name: postgre
               containerPort: {{ .service.postgre.port }}
               protocol: TCP
+            - name: oracle_11g
+              containerPort: {{ .service.oracle_11g.port }}
+              protocol: TCP
+            - name: oracle_12c
+              containerPort: {{ .service.oracle_12c.port }}
+              protocol: TCP
             {{- end }}
           livenessProbe:
             {{- toYaml .livenessProbe | nindent 12}}

charts/jumpserver/templates/magnus/service-magnus.yaml

@@ -26,6 +26,14 @@ spec:
       targetPort: postgre
       protocol: TCP
       name: postgre
+    - port: {{ .service.oracle_11g.port }}
+      targetPort: oracle_11g
+      protocol: TCP
+      name: oracle_11g
+    - port: {{ .service.oracle_12c.port }}
+      targetPort: oracle_12c
+      protocol: TCP
+      name: oracle_12c
     {{- end }}
   sessionAffinity: ClientIP
   sessionAffinityConfig:

charts/jumpserver/values.yaml

@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 global:
   imageRegistry: "docker.io"
-  imageTag: v2.23.4
+  imageTag: v2.24.0
   ## E.g.
   #  imagePullSecrets:
   #  - myRegistryKeySecretName
@@ -85,7 +85,7 @@ core:
   image:
     registry: docker.io
     repository: jumpserver/core
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -174,7 +174,7 @@ koko:
   image:
     registry: docker.io
     repository: jumpserver/koko
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -265,7 +265,7 @@ lion:
   image:
     registry: docker.io
     repository: jumpserver/lion
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -356,7 +356,7 @@ magnus:
   image:
     registry: docker.io
     repository: jumpserver/magnus
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -392,6 +392,10 @@ magnus:
       port: 33061
     postgre:
       port: 54320
+    oracle_11g:
+      port: 15211
+    oracle_12c:
+      port: 15212
 
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
@@ -442,7 +446,7 @@ omnidb:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/omnidb
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -521,7 +525,7 @@ razor:
   image:
     registry: registry.fit2cloud.com
     repository: jumpserver/razor
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []
@@ -598,7 +602,7 @@ web:
   image:
     registry: docker.io
     repository: jumpserver/web
-    tag: v2.23.4
+    tag: v2.24.0
     pullPolicy: IfNotPresent
 
   command: []