From 351d0baad55df2f721a56ff93b67dbbd7d5c9fe9 Mon Sep 17 00:00:00 2001 From: Vedant Shrotria Date: Wed, 12 Jul 2023 17:24:09 +0530 Subject: [PATCH] Added changes for fixing beta9 issues (#4086) Signed-off-by: Jonsy13 --- chaoscenter/web/config/webpack.dev.js | 6 +++--- chaoscenter/web/src/config/index.ts | 15 +++++++++++---- .../litmus-3.0.0-beta9-without-resources.yaml | 6 ++++-- mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9.yaml | 4 +++- .../litmus-namespaced-3.0.0-beta9.yaml | 6 ++++-- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/chaoscenter/web/config/webpack.dev.js b/chaoscenter/web/config/webpack.dev.js index febd7fc52..10169bed8 100644 --- a/chaoscenter/web/config/webpack.dev.js +++ b/chaoscenter/web/config/webpack.dev.js @@ -41,13 +41,13 @@ const devConfig = { } }, proxy: { - '/chaos/manager/api': { - pathRewrite: { '^/chaos/manager/api': '' }, + '/api': { + pathRewrite: { '^/api': '' }, target: process.env.CHAOS_MANAGER ? process.env.CHAOS_MANAGER : targetLocalHost ? 'http://localhost:8080' - : `${baseUrl}/chaos/manager/api`, + : `${baseUrl}/api`, secure: false, changeOrigin: true, logLevel: 'info' diff --git a/chaoscenter/web/src/config/index.ts b/chaoscenter/web/src/config/index.ts index 3299bf0b1..721a5d249 100644 --- a/chaoscenter/web/src/config/index.ts +++ b/chaoscenter/web/src/config/index.ts @@ -1,17 +1,24 @@ import type { APIConfig } from '@api/LitmusAPIProvider'; +const loc = window.location; let auth: string; let chaosManager: string; let sockURL: string; +if (loc.protocol === 'https:') { + sockURL = 'wss:'; +} else { + sockURL = 'ws:'; +} + if (__DEV__) { auth = `/auth`; - chaosManager = `/chaos/manager/api`; - sockURL = `ws://${window.location.hostname}:8080`; + chaosManager = `/api`; + sockURL += `//${window.location.hostname}:8080`; } else { auth = `${window.location.origin}/auth`; - chaosManager = `${window.location.origin}/gateway/chaos/manager/api`; - sockURL = `wss://${window.location.host}/chaos/ws`; + chaosManager = `${window.location.origin}/api`; + sockURL += `//${window.location.host}/ws`; } const APIEndpoints: APIConfig = { diff --git a/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9-without-resources.yaml b/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9-without-resources.yaml index cf5cbb813..00d4b6fe1 100644 --- a/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9-without-resources.yaml +++ b/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9-without-resources.yaml @@ -461,9 +461,11 @@ metadata: data: default.conf: | pid /tmp/nginx.pid; + events { worker_connections 1024; } + http { map $http_upgrade $connection_upgrade { default upgrade; @@ -662,8 +664,8 @@ spec: value: "litmuschaos/chaos-exporter:3.0.0-beta3" - name: SERVER_SERVICE_NAME value: "litmusportal-server-service" - - name: AGENT_DEPLOYMENTS - value: '["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"]' + - name: INFRA_DEPLOYMENTS + value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]' - name: NODE_NAME valueFrom: fieldRef: diff --git a/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9.yaml b/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9.yaml index 32c9f9b6e..9932a509c 100644 --- a/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9.yaml +++ b/mkdocs/docs/3.0.0-beta9/litmus-3.0.0-beta9.yaml @@ -461,9 +461,11 @@ metadata: data: nginx.conf: | pid /tmp/nginx.pid; + events { worker_connections 1024; } + http { map $http_upgrade $connection_upgrade { default upgrade; @@ -672,7 +674,7 @@ spec: - name: SERVER_SERVICE_NAME value: "litmusportal-server-service" - name: INFRA_DEPLOYMENTS - value: '["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"]' + value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]' - name: NODE_NAME valueFrom: fieldRef: diff --git a/mkdocs/docs/3.0.0-beta9/litmus-namespaced-3.0.0-beta9.yaml b/mkdocs/docs/3.0.0-beta9/litmus-namespaced-3.0.0-beta9.yaml index 549bb567c..0011e8194 100644 --- a/mkdocs/docs/3.0.0-beta9/litmus-namespaced-3.0.0-beta9.yaml +++ b/mkdocs/docs/3.0.0-beta9/litmus-namespaced-3.0.0-beta9.yaml @@ -427,9 +427,11 @@ metadata: data: default.conf: | pid /tmp/nginx.pid; + events { worker_connections 1024; } + http { map $http_upgrade $connection_upgrade { default upgrade; @@ -626,8 +628,8 @@ spec: value: "" - name: CHAOS_CENTER_SCOPE value: "namespace" - - name: AGENT_DEPLOYMENTS - value: '["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"]' + - name: INFRA_DEPLOYMENTS + value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]' - name: SERVER_SERVICE_NAME value: "litmusportal-server-service" - name: CHAOS_CENTER_UI_ENDPOINT