From c5469d529264a3dc9f3d774d598a00b407cbb973 Mon Sep 17 00:00:00 2001
From: wojiushixiaobai <296015668@qq.com>
Date: Tue, 17 Aug 2021 15:10:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20ws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configs/jms-nginx/nginx.conf | 11 +++++++----
 values.yaml                  |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configs/jms-nginx/nginx.conf b/configs/jms-nginx/nginx.conf
index 8335aa1..a356c71 100644
--- a/configs/jms-nginx/nginx.conf
+++ b/configs/jms-nginx/nginx.conf
@@ -1,6 +1,7 @@
 {{- $koko := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-koko" ($.Values.koko.service.web.port | toString) }}
 {{- $lion := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-lion" ($.Values.lion.service.web.port | toString) }}
-{{- $core := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.web.port | toString) }}
+{{- $web := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.web.port | toString) }}
+{{- $ws := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.ws.port | toString) }}
 user nginx;
 worker_processes auto;
 error_log /var/log/nginx/error.log;
@@ -73,7 +74,7 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
         location /ws/ {
-            proxy_pass {{$core}};
+            proxy_pass {{$ws}};
             proxy_buffering off;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
@@ -83,13 +84,15 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
         location /api/ {
-            proxy_pass {{$core}};
+            proxy_pass {{$web}};
+            proxy_buffering off;
             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 /core/ {
-            proxy_pass {{$core}};
+            proxy_pass {{$web}};
+            proxy_buffering off;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/values.yaml b/values.yaml
index a5c3371..c09b16e 100644
--- a/values.yaml
+++ b/values.yaml
@@ -21,6 +21,10 @@ ingress:
     # kubernetes.io/tls-acme: "true"
     compute-full-forwarded-for: "true"
     use-forwarded-headers: "true"
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+       proxy_set_header Upgrade "websocket";
+       proxy_set_header Connection "Upgrade";
 
   hosts:
     - "test.jumpserver.org"