Merge branch 'refactor_merge' into 'master'

Refactor merge

See merge request !1

kpl/cfg-kpl-backend.yaml

@@ -17,7 +17,7 @@ data:
       monitor_port: "8920"
       monitor_port: "8920"
       deploy_proxy_port: "8921"
       deploy_proxy_port: "8921"
       monitor_host: "http://kpl--monitor.kpl.svc.cluster.local:8920/"
       monitor_host: "http://kpl--monitor.kpl.svc.cluster.local:8920/"
-      deploy_host: "kpl_deploy/api"
+      deploy_host: "kpl_backend/api"
       ssh_host: "kpl_stream"
       ssh_host: "kpl_stream"
       init_token: "" #用于初始化超级管理员等功能的token
       init_token: "" #用于初始化超级管理员等功能的token
 
 

kpl/cfg-kpl-frontend.yaml

@@ -3,11 +3,11 @@ data:
   production-base.js: |
   production-base.js: |
     const productionHost = {
     const productionHost = {
       'baseUrl': 'kpl_backend/api/v1',
       'baseUrl': 'kpl_backend/api/v1',
-      'rootUrl': 'kpl_backend',
+      'rootUrl': 'kpl_backend/api/v1',
+      'jupyterRootUrl': 'kpl_backend',
       'baseWebSocket': 'kpl_back_socket/api/v1',
       'baseWebSocket': 'kpl_back_socket/api/v1',
-      'imageProxyUrl': 'kpl_imageproxy',
-      'apiTestUrl': 'mobile_frontend',
-      'adminUrl': 'kpl_admin_frontend/admin/login',
+      'apiTestUrl': 'kpl_backend',
+      'adminUrl': 'kpl_backend/admin/login',
     }
     }
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:

kpl/cfg-kpl-nginx.yaml

@@ -12,7 +12,12 @@ data:
         ssl_prefer_server_ciphers on;
         ssl_prefer_server_ciphers on;
 
 
         location / {
         location / {
-            proxy_pass http://kpl--backend:8919;
+          resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+          proxy_pass http://kpl--frontend.kpl.svc.cluster.local:80$request_uri;
+        }
+        location ^~ /api/v1 {
+            resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+            proxy_pass http://kpl--backend.kpl.svc.cluster.local:8919$request_uri;
             proxy_set_header Host $host;
             proxy_set_header Host $host;
             proxy_connect_timeout 10s;
             proxy_connect_timeout 10s;
             proxy_read_timeout 3600s;
             proxy_read_timeout 3600s;
@@ -45,56 +50,6 @@ data:
           root /etc/nginx;
           root /etc/nginx;
         }
         }
      }
      }
-  deployproxy.conf: |
-    server {
-        listen 81;
-        location / {
-            proxy_pass http://kpl--deploy:8921;
-            proxy_set_header Host $host;
-            proxy_connect_timeout 10s;
-            proxy_read_timeout 3600s;
-            proxy_send_timeout 3600s;
-            proxy_set_header X-Real-IP       $remote_addr;
-            proxy_set_header X-Forwarded-For  $proxy_add_x_forwarded_for;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            client_max_body_size  50m;
-        }
-
-        location = /basic_status {
-            stub_status;
-        }
-
-        error_page 502 /502.html;
-        location = /502.html {
-          root /etc/nginx;
-        }
-     }
-  imageproxy.conf: |
-    server {
-        listen 82;
-        location / {
-            proxy_pass http://kpl--image-proxy:8922/;
-            proxy_set_header Host $host;
-            proxy_connect_timeout 10s;
-            proxy_read_timeout 3600s;
-            proxy_send_timeout 3600s;
-            proxy_set_header X-Real-IP       $remote_addr;
-            proxy_set_header X-Forwarded-For  $proxy_add_x_forwarded_for;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            client_max_body_size  50m;
-        }
-
-        location = /basic_status {
-            stub_status;
-        }
-
-        error_page 502 /502.html;
-        location = /502.html {
-          root /etc/nginx;
-        }
-     }
   nginx.conf: |
   nginx.conf: |
     user  nginx;
     user  nginx;
     worker_processes  2;
     worker_processes  2;