fix: 修正 omnidb 参数

charts/jumpserver/configs/jms-web/default.conf

@@ -2,8 +2,7 @@
 {{ $lion := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-lion" ($.Values.lion.service.web.port | toString) }}
 {{ $coreweb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.web.port | toString) }}
 {{ $corews := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.ws.port | toString) }}
-{{ $omnidbweb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-omnidb" ($.Values.omnidb.service.web.port | toString) }}
-{{ $omnidbws := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-omnidb" ($.Values.omnidb.service.ws.port | toString) }}
+{{ $omnidb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-omnidb" ($.Values.omnidb.service.web.port | toString) }}
 server {
     listen {{ $.Values.web.service.web.port }};
     server_name  _;
@@ -47,21 +46,9 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
-    location /omnidb/ws {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream {{$omnidbws}};
-        proxy_pass $upstream$request_uri;
-        proxy_http_version 1.1;
-        proxy_buffering off;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
     location /omnidb/ {
         resolver 127.0.0.11 valid=30s;
-        set $upstream {{$omnidbweb}};
+        set $upstream {{$omnidb}};
         proxy_pass $upstream$request_uri;
         proxy_buffering off;
         proxy_http_version 1.1;

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

@@ -48,8 +48,6 @@ spec:
               value: "{{ $.Values.core.config.bootstrapToken }}"
             - name: LOG_LEVEL
               value: "{{ .config.log.level }}"
-            - name: websocket_port
-              value: "{{ .service.ws.port }}"
             - name: listening_port
               value: "{{ .service.web.port }}"
           {{- with .env }}
@@ -59,9 +57,6 @@ spec:
             - name: web
               containerPort: {{ .service.web.port }}
               protocol: TCP
-            - name: ws
-              containerPort: {{ .service.ws.port }}
-              protocol: TCP
           livenessProbe:
             {{- toYaml .livenessProbe | nindent 12}}
           readinessProbe:

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

@@ -17,10 +17,6 @@ spec:
       targetPort: web
       protocol: TCP
       name: web
-    - port: {{ .service.ws.port }}
-      targetPort: ws
-      protocol: TCP
-      name: ws
   sessionAffinity: ClientIP
   sessionAffinityConfig:
     clientIP:

charts/jumpserver/values.yaml

@@ -368,8 +368,6 @@ omnidb:
     type: ClusterIP
     web:
       port: 8082
-    ws:
-      port: 8071
 
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious