Added changes for fixing beta9 issues (#4086)
Signed-off-by: Jonsy13 <vedant.shrotria@harness.io>
This commit is contained in:
parent
30b703c522
commit
351d0baad5
|
@ -41,13 +41,13 @@ const devConfig = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
proxy: {
|
proxy: {
|
||||||
'/chaos/manager/api': {
|
'/api': {
|
||||||
pathRewrite: { '^/chaos/manager/api': '' },
|
pathRewrite: { '^/api': '' },
|
||||||
target: process.env.CHAOS_MANAGER
|
target: process.env.CHAOS_MANAGER
|
||||||
? process.env.CHAOS_MANAGER
|
? process.env.CHAOS_MANAGER
|
||||||
: targetLocalHost
|
: targetLocalHost
|
||||||
? 'http://localhost:8080'
|
? 'http://localhost:8080'
|
||||||
: `${baseUrl}/chaos/manager/api`,
|
: `${baseUrl}/api`,
|
||||||
secure: false,
|
secure: false,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
logLevel: 'info'
|
logLevel: 'info'
|
||||||
|
|
|
@ -1,17 +1,24 @@
|
||||||
import type { APIConfig } from '@api/LitmusAPIProvider';
|
import type { APIConfig } from '@api/LitmusAPIProvider';
|
||||||
|
|
||||||
|
const loc = window.location;
|
||||||
let auth: string;
|
let auth: string;
|
||||||
let chaosManager: string;
|
let chaosManager: string;
|
||||||
let sockURL: string;
|
let sockURL: string;
|
||||||
|
|
||||||
|
if (loc.protocol === 'https:') {
|
||||||
|
sockURL = 'wss:';
|
||||||
|
} else {
|
||||||
|
sockURL = 'ws:';
|
||||||
|
}
|
||||||
|
|
||||||
if (__DEV__) {
|
if (__DEV__) {
|
||||||
auth = `/auth`;
|
auth = `/auth`;
|
||||||
chaosManager = `/chaos/manager/api`;
|
chaosManager = `/api`;
|
||||||
sockURL = `ws://${window.location.hostname}:8080`;
|
sockURL += `//${window.location.hostname}:8080`;
|
||||||
} else {
|
} else {
|
||||||
auth = `${window.location.origin}/auth`;
|
auth = `${window.location.origin}/auth`;
|
||||||
chaosManager = `${window.location.origin}/gateway/chaos/manager/api`;
|
chaosManager = `${window.location.origin}/api`;
|
||||||
sockURL = `wss://${window.location.host}/chaos/ws`;
|
sockURL += `//${window.location.host}/ws`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const APIEndpoints: APIConfig = {
|
const APIEndpoints: APIConfig = {
|
||||||
|
|
|
@ -461,9 +461,11 @@ metadata:
|
||||||
data:
|
data:
|
||||||
default.conf: |
|
default.conf: |
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
map $http_upgrade $connection_upgrade {
|
map $http_upgrade $connection_upgrade {
|
||||||
default upgrade;
|
default upgrade;
|
||||||
|
@ -662,8 +664,8 @@ spec:
|
||||||
value: "litmuschaos/chaos-exporter:3.0.0-beta3"
|
value: "litmuschaos/chaos-exporter:3.0.0-beta3"
|
||||||
- name: SERVER_SERVICE_NAME
|
- name: SERVER_SERVICE_NAME
|
||||||
value: "litmusportal-server-service"
|
value: "litmusportal-server-service"
|
||||||
- name: AGENT_DEPLOYMENTS
|
- 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
|
- name: NODE_NAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
|
|
|
@ -461,9 +461,11 @@ metadata:
|
||||||
data:
|
data:
|
||||||
nginx.conf: |
|
nginx.conf: |
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
map $http_upgrade $connection_upgrade {
|
map $http_upgrade $connection_upgrade {
|
||||||
default upgrade;
|
default upgrade;
|
||||||
|
@ -672,7 +674,7 @@ spec:
|
||||||
- name: SERVER_SERVICE_NAME
|
- name: SERVER_SERVICE_NAME
|
||||||
value: "litmusportal-server-service"
|
value: "litmusportal-server-service"
|
||||||
- name: INFRA_DEPLOYMENTS
|
- 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
|
- name: NODE_NAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
|
|
|
@ -427,9 +427,11 @@ metadata:
|
||||||
data:
|
data:
|
||||||
default.conf: |
|
default.conf: |
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
map $http_upgrade $connection_upgrade {
|
map $http_upgrade $connection_upgrade {
|
||||||
default upgrade;
|
default upgrade;
|
||||||
|
@ -626,8 +628,8 @@ spec:
|
||||||
value: ""
|
value: ""
|
||||||
- name: CHAOS_CENTER_SCOPE
|
- name: CHAOS_CENTER_SCOPE
|
||||||
value: "namespace"
|
value: "namespace"
|
||||||
- name: AGENT_DEPLOYMENTS
|
- 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: SERVER_SERVICE_NAME
|
- name: SERVER_SERVICE_NAME
|
||||||
value: "litmusportal-server-service"
|
value: "litmusportal-server-service"
|
||||||
- name: CHAOS_CENTER_UI_ENDPOINT
|
- name: CHAOS_CENTER_UI_ENDPOINT
|
||||||
|
|
Loading…
Reference in New Issue