Fix cron jobs not being viewable on newer kube (#6542)

* Replace use of legacy globals with injectables

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove dead code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix error shown to users when load fails

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Switch CronJob default apiBase

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/common/k8s-api/endpoints/cron-job.api.injectable.ts

@@ -13,7 +13,12 @@ const cronJobApiInjectable = getInjectable({
   instantiate: (di) => {
     assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "cronJobApi is only available in certain environments");
 
-    return new CronJobApi();
+    return new CronJobApi({
+      fallbackApiBases: [
+        "/apis/batch/v1beta1/cronjobs",
+      ],
+      checkPreferredVersion: true,
+    });
   },
 
   injectionToken: kubeApiInjectionToken,

src/common/k8s-api/endpoints/cron-job.api.ts

@@ -73,7 +73,7 @@ export class CronJob extends KubeObject<
 > {
   static readonly kind = "CronJob";
   static readonly namespaced = true;
-  static readonly apiBase = "/apis/batch/v1beta1/cronjobs";
+  static readonly apiBase = "/apis/batch/v1/cronjobs";
 
   getSuspendFlag() {
     return (this.spec.suspend ?? false).toString();

src/common/k8s-api/kube-object.store.ts

@@ -7,7 +7,7 @@ import type { ClusterContext } from "./cluster-context";
 
 import { action, computed, makeObservable, observable, reaction, when } from "mobx";
 import type { Disposer } from "../utils";
-import { waitUntilDefined, autoBind, includes, isRequestError, noop, rejectPromiseBy } from "../utils";
+import { waitUntilDefined, autoBind, includes, noop, rejectPromiseBy } from "../utils";
 import type { KubeJsonApiDataFor, KubeObject } from "./kube-object";
 import { KubeStatus } from "./kube-object";
 import type { IKubeWatchEvent } from "./kube-watch-event";
@@ -221,11 +221,7 @@ export abstract class KubeObjectStore<
         try {
           return await res ?? [];
         } catch (error) {
-          onLoadFailure((
-            isRequestError(error)
-              ? error.message || error.toString()
-              : "Unknown error"
-          ));
+          onLoadFailure(String(error));
 
           // reset the store because we are loading all, so that nothing is displayed
           this.items.clear();

src/renderer/components/+workloads-cronjobs/cronjobs.tsx

@@ -7,14 +7,18 @@ import "./cronjobs.scss";
 
 import React from "react";
 import { observer } from "mobx-react";
-import { cronJobStore } from "./legacy-store";
-import { jobStore } from "../+workloads-jobs/legacy-store";
-import { eventStore } from "../+events/legacy-store";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import moment from "moment";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
+import type { CronJobStore } from "./store";
+import type { JobStore } from "../+workloads-jobs/store";
+import type { EventStore } from "../+events/store";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import cronJobStoreInjectable from "./store.injectable";
+import jobStoreInjectable from "../+workloads-jobs/store.injectable";
+import eventStoreInjectable from "../+events/store.injectable";
 
 enum columnId {
   name = "name",
@@ -26,9 +30,21 @@ enum columnId {
   age = "age",
 }
 
+interface Dependencies {
+  cronJobStore: CronJobStore;
+  jobStore: JobStore;
+  eventStore: EventStore;
+}
+
 @observer
-export class CronJobs extends React.Component {
+class NonInjectedCronJobs extends React.Component<Dependencies>{
   render() {
+    const {
+      cronJobStore,
+      eventStore,
+      jobStore,
+    } = this.props;
+
     return (
       <SiblingsInTabLayout>
         <KubeObjectListLayout
@@ -80,3 +96,11 @@ export class CronJobs extends React.Component {
   }
 }
 
+export const CronJobs = withInjectables<Dependencies>(NonInjectedCronJobs, {
+  getProps: (di, props) => ({
+    cronJobStore: di.inject(cronJobStoreInjectable),
+    eventStore: di.inject(eventStoreInjectable),
+    jobStore: di.inject(jobStoreInjectable),
+    ...props,
+  }),
+});

src/renderer/components/+workloads-cronjobs/legacy-store.ts

@@ -1,12 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { asLegacyGlobalForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
-import cronJobStoreInjectable from "./store.injectable";
-
-/**
- * @deprecated use `di.inject(cronJobStoreInjectable)` instead
- */
-export const cronJobStore = asLegacyGlobalForExtensionApi(cronJobStoreInjectable);