Skip to content

Commit eb048ad

Browse files
authored
vPRO new rtk generate for RPS and MPS (#145)
1 parent 2f47915 commit eb048ad

24 files changed

Lines changed: 467 additions & 32 deletions

File tree

apps/admin/deploy/templates/_helpers.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ window.__RUNTIME_CONFIG__ = {
8484
MB: {{ .Values.api.metadataBroker | quote }},
8585
ALERT: {{ .Values.api.alertManager | quote }},
8686
TM: {{ .Values.api.tenantManager | quote }},
87+
RPS: {{ .Values.api.rps | quote }},
88+
MPS: {{ .Values.api.mps | quote }},
8789
},
8890
}
8991
{{- end -}}

apps/admin/deploy/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ api:
3232
metadataBroker: "https://metadata.kind.internal"
3333
alertManager: "https://alerting-monitor.kind.internal"
3434
tenantManager: "https://api.kind.internal"
35+
rps: "https://api.kind.internal"
36+
mps: "https://api.kind.internal"
3537

3638
image:
3739
repository: orch-ui/admin

apps/app-orch/public/runtime-config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ window.__RUNTIME_CONFIG__ = {
7676
MB: `https://api.${fqdn}`,
7777
ALERT: `https://api.${fqdn}/`,
7878
TM: `https://api.${fqdn}/`,
79+
RPS: `https://api.${fqdn}/`,
80+
MPS: `https://api.${fqdn}/`,
7981
},
8082
VERSIONS: {
8183
orchestrator: "unknown",

apps/cluster-orch/public/runtime-config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ window.__RUNTIME_CONFIG__ = {
7676
MB: `https://api.${fqdn}`,
7777
ALERT: `https://api.${fqdn}/`,
7878
TM: `https://api.${fqdn}/`,
79+
RPS: `https://api.${fqdn}/`,
80+
MPS: `https://api.${fqdn}/`,
7981
},
8082
VERSIONS: {
8183
orchestrator: "unknown",

apps/infra/deploy/templates/_helpers.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ AUTH: {{ .Values.global.auth.enabled | quote }},
9191
CO: {{ .Values.api.clusterOrch | quote }},
9292
MB: {{ .Values.api.metadataBroker | quote }},
9393
ALERT: {{ .Values.api.alertManager | quote }},
94+
RPS: {{ .Values.api.rps | quote }},
95+
MPS: {{ .Values.api.mps | quote }},
9496
},
9597
VERSIONS: {
9698
orchestrator: {{ .Values.versions.orchestrator | quote }},

apps/infra/deploy/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ api:
135135
clusterOrch: "https://api.kind.internal"
136136
metadataBroker: "https://api.kind.internal"
137137
alertManager: "https://api.kind.internal"
138+
rps: "https://api.kind.internal"
139+
mps: "https://api.kind.internal"
138140

139141
image:
140142
repository: orch-ui/infra

apps/infra/public/runtime-config.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
// SPDX-FileCopyrightText: (C) 2022 Intel Corporation
77
// SPDX-License-Identifier: Apache-2.0
88

9+
const fqdn = "kind.internal";
10+
911
window.__RUNTIME_CONFIG__ = {
1012
AUTH: "true",
11-
KC_URL: "https://keycloak.kind.internal",
13+
KC_URL: `https://keycloak.${fqdn}`,
1214
KC_REALM: "master",
1315
KC_CLIENT_ID: "webui-client",
1416
SESSION_TIMEOUT: 0,
15-
OBSERVABILITY_URL: "https://observability-ui.kind.internal",
17+
OBSERVABILITY_URL: `https://observability-ui.${fqdn}`,
1618
DOCUMENTATION_URL: "https://docs.openedgeplatform.intel.com/edge-manage-docs/main",
1719
DOCUMENTATION: [
1820
{ src: "/dashboard", dest: "/user_guide/monitor_deployments/index.html" },
@@ -66,14 +68,16 @@ window.__RUNTIME_CONFIG__ = {
6668
},
6769
TITLE: "Infra Manager",
6870
API: {
69-
CATALOG: "https://app-orch.kind.internal",
70-
ADM: "https://app-orch.kind.internal",
71-
INFRA: "https://api.kind.internal",
72-
ARM: "https://app-orch.kind.internal",
73-
CO: "https://cluster-orch.kind.internal",
74-
MB: "https://api.kind.internal",
75-
TM: "https://api.kind.internal",
76-
ALERT: "https://api.kind.internal",
71+
CATALOG: `https://app-orch.${fqdn}`,
72+
ADM: `https://app-orch.${fqdn}`,
73+
INFRA: `https://api.${fqdn}`,
74+
ARM: `https://app-orch.${fqdn}`,
75+
CO: `https://cluster-orch.${fqdn}`,
76+
MB: `https://api.${fqdn}`,
77+
TM: `https://api.${fqdn}`,
78+
ALERT: `https://api.${fqdn}`,
79+
RPS: `https://api.${fqdn}`,
80+
MPS: `https://api.${fqdn}`,
7781
},
7882
VERSIONS: {
7983
orchestrator: "unknown",

apps/infra/src/store/store.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import { enhancedInfraSlice, mbApi, tmSlice } from "@orch-ui/apis";
6+
import {
7+
enhancedInfraSlice,
8+
mbApi,
9+
mpsSlice,
10+
rpsSlice,
11+
tmSlice,
12+
} from "@orch-ui/apis";
713
import { UiSlice, uiSliceName } from "@orch-ui/components";
814
import {
915
Action,
@@ -29,6 +35,8 @@ const rootReducer = combineReducers({
2935
[mbApi.metadataBroker.reducerPath]: mbApi.metadataBroker.reducer,
3036
[uiSliceName]: UiSlice,
3137
[tmSlice.reducerPath]: tmSlice.reducer,
38+
[rpsSlice.reducerPath]: rpsSlice.reducer,
39+
[mpsSlice.reducerPath]: mpsSlice.reducer,
3240
});
3341

3442
export const setupStore = (preloadedState?: Partial<RootState>) => {
@@ -41,7 +49,9 @@ export const setupStore = (preloadedState?: Partial<RootState>) => {
4149
})
4250
.concat(enhancedInfraSlice.miEnhancedApi.middleware)
4351
.concat(mbApi.metadataBroker.middleware)
44-
.concat(tmSlice.middleware),
52+
.concat(tmSlice.middleware)
53+
.concat(rpsSlice.middleware)
54+
.concat(mpsSlice.middleware),
4555
preloadedState,
4656
});
4757
};
@@ -55,7 +65,9 @@ export const store = configureStore({
5565
})
5666
.concat(enhancedInfraSlice.miEnhancedApi.middleware)
5767
.concat(mbApi.metadataBroker.middleware)
58-
.concat(tmSlice.middleware),
68+
.concat(tmSlice.middleware)
69+
.concat(rpsSlice.middleware)
70+
.concat(mpsSlice.middleware),
5971
});
6072

6173
setupListeners(store.dispatch);

apps/root/deploy/templates/_helpers.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ window.__RUNTIME_CONFIG__ = {
101101
MB: {{ .Values.api.metadataBroker | quote }},
102102
ALERT: {{ .Values.api.alertManager | quote }},
103103
TM: {{ .Values.api.tenantManager | quote }},
104+
RPS: {{ .Values.api.rps | quote }},
105+
MPS: {{ .Values.api.mps | quote }},
104106
},
105107
VERSIONS: {
106108
orchestrator: {{ .Values.versions.orchestrator | quote }},

apps/root/deploy/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ api:
4242
metadataBroker: "https://api.kind.internal"
4343
alertManager: "https://api.kind.internal"
4444
tenantManager: "https://api.kind.internal"
45+
rps: "https://api.kind.internal"
46+
mps: "https://api.kind.internal"
4547

4648
# Used to configure the Header title
4749
header:

0 commit comments

Comments
 (0)