Skip to content

Commit 3d9acdf

Browse files
authored
Merge pull request #55 from bartoval/route_by_selector
Route by selector
2 parents 5756639 + 991cbb7 commit 3d9acdf

File tree

3 files changed

+152
-143
lines changed

3 files changed

+152
-143
lines changed

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"dependencies": {
2222
"@patternfly/patternfly": "5.4.2",
2323
"@patternfly/react-component-groups": "^5.5.8",
24-
"@patternfly/react-core": "5.4.12",
24+
"@patternfly/react-core": "5.4.14",
2525
"@patternfly/react-icons": "5.4.2",
26-
"@patternfly/react-table": "5.4.14",
26+
"@patternfly/react-table": "5.4.16",
2727
"@tanstack/react-query": "4.36.1",
28-
"axios": "1.8.2",
28+
"axios": "1.8.4",
2929
"react-dom": "17.0.2",
3030
"yaml": "2.7.0"
3131
},
@@ -38,31 +38,31 @@
3838
"@testing-library/react": "^12.1.5",
3939
"@testing-library/user-event": "^14.6.1",
4040
"@types/node": "^22.13.10",
41-
"@types/react": "^17.0.83",
41+
"@types/react": "^17.0.84",
4242
"@types/react-dom": "^19.0.4",
4343
"@types/react-router-dom": "^5.3.3",
4444
"@vitest/coverage-v8": "^2.1.9",
45-
"@vitest/eslint-plugin": "^1.1.37",
46-
"copy-webpack-plugin": "^12.0.2",
45+
"@vitest/eslint-plugin": "^1.1.38",
46+
"copy-webpack-plugin": "^13.0.0",
4747
"css-loader": "^7.1.2",
4848
"eslint": "^9.22.0",
4949
"eslint-config-prettier": "^10.1.1",
5050
"eslint-plugin-import": "^2.31.0",
5151
"eslint-plugin-prettier": "^5.2.3",
5252
"eslint-plugin-react": "^7.37.4",
53-
"eslint-plugin-react-hooks": "^5.1.0",
53+
"eslint-plugin-react-hooks": "^5.2.0",
5454
"file-loader": "^6.2.0",
55-
"globals": "^15.14.0",
55+
"globals": "^16.0.0",
5656
"jsdom": "^26.0.0",
5757
"pluralize": "^8.0.0",
58-
"prettier": "^3.4.2",
58+
"prettier": "^3.5.3",
5959
"style-loader": "^4.0.0",
6060
"ts-loader": "^9.5.2",
6161
"ts-node": "^10.9.2",
6262
"ts-prune": "^0.10.3",
6363
"tsconfig-paths-webpack-plugin": "^4.2.0",
64-
"typescript": "^5.7.3",
65-
"typescript-eslint": "^8.23.0",
64+
"typescript": "^5.8.2",
65+
"typescript-eslint": "^8.27.0",
6666
"vitest": "^2.1.9",
6767
"webpack": "5.97.1",
6868
"webpack-cli": "6.0.1",

src/console/pages/components/DeploymentNetworkConsoleButton.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ interface PodResource extends K8sResourceCommon {
4040
};
4141
}
4242

43-
const ROUTE = 'skupper-network-observer';
4443
const POD_SELECTOR = { 'app.kubernetes.io/part-of': 'skupper-network-observer' };
4544
const POD_LOADED_STATUS = 'Running';
4645

@@ -52,7 +51,9 @@ const DeploymentNetworkConsoleButton = function () {
5251
groupVersionKind,
5352
namespace: NamespaceManager.getNamespace(),
5453
isList: false,
55-
name: ROUTE
54+
selector: {
55+
matchLabels: POD_SELECTOR
56+
}
5657
};
5758

5859
const watchResourcePod = {
@@ -85,11 +86,10 @@ const DeploymentNetworkConsoleButton = function () {
8586
const handleDeleteConsole = async () => {
8687
mutationDelete.mutate();
8788
};
88-
useEffect(() => {
89-
const data = route;
9089

91-
if (data?.spec?.host && data?.spec?.port?.targetPort) {
92-
const newUrl = data?.spec?.host ? `${data?.spec?.port?.targetPort}://${data?.spec?.host}` : undefined;
90+
useEffect(() => {
91+
if (route?.spec?.host && route?.spec?.port?.targetPort) {
92+
const newUrl = route?.spec?.host ? `${route?.spec?.port?.targetPort}://${route?.spec?.host}` : undefined;
9393
setUrl(newUrl);
9494
}
9595
}, [route]);

0 commit comments

Comments
 (0)