From d34a13fad281de4ed639cac61d29c71ecdafb119 Mon Sep 17 00:00:00 2001 From: Jan Jansen Date: Thu, 5 Jan 2023 14:48:00 +0100 Subject: [PATCH] look for more v1 groups Signed-off-by: Jan Jansen --- .../config/config-maps/config-maps-route.injectable.ts | 2 +- .../config/limit-ranges/limit-ranges-route.injectable.ts | 2 +- .../resource-quotas/resource-quotas-route.injectable.ts | 2 +- .../routes/cluster/config/secrets/secrets-route.injectable.ts | 2 +- .../routes/cluster/events/events-route.injectable.ts | 2 +- .../routes/cluster/namespaces/namespaces-route.injectable.ts | 2 +- .../cluster/network/endpoints/endpoints-route.injectable.ts | 2 +- .../cluster/network/services/services-route.injectable.ts | 2 +- .../routes/cluster/nodes/nodes-route.injectable.ts | 2 +- .../cluster/overview/cluster-overview-route.injectable.ts | 2 +- .../persistent-volume-claims-route.injectable.ts | 2 +- .../persistent-volumes/persistent-volumes-route.injectable.ts | 2 +- .../service-accounts/service-accounts-route.injectable.ts | 2 +- .../routes/cluster/workloads/pods/pods-route.injectable.ts | 2 +- .../cluster/namespaces/edit-namespace-from-new-tab.test.tsx | 2 +- .../edit-namespace-from-previously-opened-tab.test.tsx | 2 +- src/features/cluster/visibility-of-sidebar-items.test.tsx | 4 ++-- src/features/cluster/workload-overview.test.tsx | 2 +- .../workloads/implementations/pods-workload.injectable.ts | 2 +- src/renderer/frames/cluster-frame/cluster-frame.test.tsx | 4 ++-- src/renderer/initializers/workload-events.tsx | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts index 6ea03fff08..0ad7ed3d88 100644 --- a/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts @@ -13,7 +13,7 @@ const configMapsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "configmaps", - group: "v1", + group: "", }), }), injectionToken: frontEndRouteInjectionToken, diff --git a/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts index 8623f3520e..0536e76004 100644 --- a/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts @@ -14,7 +14,7 @@ const limitRangesRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "limitranges", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts index 209f77e19a..4905b70890 100644 --- a/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts @@ -14,7 +14,7 @@ const resourceQuotasRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "resourcequotas", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts index 079ddcbf83..7442de14b1 100644 --- a/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts @@ -14,7 +14,7 @@ const secretsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "secrets", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts b/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts index b3df358ad8..728f80c21d 100644 --- a/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts @@ -14,7 +14,7 @@ const eventsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "events", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts b/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts index 2aa6c23efe..0b57c8d573 100644 --- a/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts @@ -14,7 +14,7 @@ const namespacesRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "namespaces", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts index c88ec04714..50b3c72e4c 100644 --- a/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts @@ -14,7 +14,7 @@ const endpointsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "endpoints", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts index 53300ee241..223ded1e65 100644 --- a/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts @@ -14,7 +14,7 @@ const servicesRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "services", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts index 81323843d5..e6ca61346e 100644 --- a/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts @@ -14,7 +14,7 @@ const nodesRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "nodes", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts b/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts index 8315fd7773..e559c35079 100644 --- a/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts @@ -14,7 +14,7 @@ const clusterOverviewRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "nodes", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts index 1b96933136..dbda527555 100644 --- a/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts @@ -14,7 +14,7 @@ const persistentVolumeClaimsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "persistentvolumeclaims", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts index 52f95b32c6..7a06d9df58 100644 --- a/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts @@ -14,7 +14,7 @@ const persistentVolumesRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "persistentvolumes", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts index 3bf6c1ec00..65d02135c7 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts @@ -14,7 +14,7 @@ const serviceAccountsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "serviceaccounts", - group: "v1", + group: "", }), }), diff --git a/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts index 577f1c1a91..d013f872f0 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts @@ -14,7 +14,7 @@ const podsRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "pods", - group: "v1", + group: "", }), }), diff --git a/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx b/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx index f37ada1736..49e8300199 100644 --- a/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx +++ b/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx @@ -100,7 +100,7 @@ describe("cluster/namespaces - edit namespace from new tab", () => { builder.allowKubeResource({ apiName: "namespaces", - group: "v1", + group: "", }); }); diff --git a/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx b/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx index 4cf63ee353..029f9c47fd 100644 --- a/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx +++ b/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx @@ -44,7 +44,7 @@ describe("cluster/namespaces - edit namespaces from previously opened tab", () = builder.allowKubeResource({ apiName: "namespaces", - group: "v1", + group: "", }); }); diff --git a/src/features/cluster/visibility-of-sidebar-items.test.tsx b/src/features/cluster/visibility-of-sidebar-items.test.tsx index 2eb42b7fdf..8fd68044a6 100644 --- a/src/features/cluster/visibility-of-sidebar-items.test.tsx +++ b/src/features/cluster/visibility-of-sidebar-items.test.tsx @@ -52,7 +52,7 @@ describe("cluster - visibility of sidebar items", () => { beforeEach(() => { builder.allowKubeResource({ apiName: "namespaces", - group: "v1", + group: "", }); }); @@ -77,7 +77,7 @@ const testRouteInjectable = getInjectable({ clusterFrame: true, isEnabled: di.inject(shouldShowResourceInjectionToken, { apiName: "namespaces", - group: "v1", + group: "", }), }), diff --git a/src/features/cluster/workload-overview.test.tsx b/src/features/cluster/workload-overview.test.tsx index 205c837b47..725ec04e90 100644 --- a/src/features/cluster/workload-overview.test.tsx +++ b/src/features/cluster/workload-overview.test.tsx @@ -15,7 +15,7 @@ describe("workload overview", () => { applicationBuilder = getApplicationBuilder().setEnvironmentToClusterFrame(); applicationBuilder.allowKubeResource({ apiName: "pods", - group: "v1", + group: "", }); rendered = await applicationBuilder.render(); }); diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts index 452f7903aa..246469b9e7 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts @@ -21,7 +21,7 @@ const podsWorkloadInjectable = getInjectable({ return { resource: { apiName: "pods", - group: "v1", + group: "", }, open: navigate, diff --git a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx index b969291fd2..7393f6aeb3 100644 --- a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx +++ b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx @@ -69,7 +69,7 @@ describe("", () => { describe("given cluster with list nodes and namespaces permissions", () => { beforeEach(() => { // TODO: replace with not using private info - (cluster as any).allowedResources.replace(["v1/nodes", "v1/namespaces"]); + (cluster as any).allowedResources.replace(["/nodes", "/namespaces"]); }); it("renders", () => { @@ -110,7 +110,7 @@ describe("", () => { describe("given cluster without list nodes, but with namespaces permissions", () => { beforeEach(() => { - (cluster as any).allowedResources.replace(["v1/namespaces"]); + (cluster as any).allowedResources.replace(["/namespaces"]); }); it("renders", () => { diff --git a/src/renderer/initializers/workload-events.tsx b/src/renderer/initializers/workload-events.tsx index 735b4e2c74..73251382c8 100644 --- a/src/renderer/initializers/workload-events.tsx +++ b/src/renderer/initializers/workload-events.tsx @@ -34,7 +34,7 @@ export const WorkloadEvents = withInjectables getProps: (di, props) => ({ workloadEventsAreAllowed: di.inject(shouldShowResourceInjectionToken, { apiName: "events", - group: "v1", + group: "", }), ...props, }),