Fix PodDistruptionBudgets not displaying on newer Kube versions (#6989)

* Add ability for KubeApi to filter server versions

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

* Update error message

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

* Fix tests

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

* Check preferred version for PodDistruptionBudgets

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

* Limit which versions can be used

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

* Make sure that details are show for all versions
- Remove duplicate versioning checks since everything must go through the API anyway

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

* Remove unnecessary logger as dep

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

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

packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts

@@ -18,6 +18,14 @@ const podDisruptionBudgetApiInjectable = getInjectable({
     return new PodDisruptionBudgetApi({
       logger: di.inject(loggerInjectable),
       maybeKubeApi: di.inject(maybeKubeApiInjectable),
+    }, {
+      checkPreferredVersion: true,
+      allowedUsableVersions: {
+        policy: [
+          "v1",
+          "v1beta1",
+        ],
+      },
     });
   },
 

packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.ts

@@ -7,20 +7,45 @@ import type { LabelSelector, NamespaceScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import type { DerivedKubeApiOptions, KubeApiDependencies } from "../kube-api";
 import { KubeApi } from "../kube-api";
+import type { Condition } from "./types/condition";
 
-export interface PodDisruptionBudgetSpec {
+export interface V1Beta1PodDisruptionBudgetSpec {
   minAvailable: string;
   maxUnavailable: string;
   selector: LabelSelector;
 }
 
-export interface PodDisruptionBudgetStatus {
+export interface V1PodDisruptionBudgetSpec {
+  maxUnavailable?: string | number;
+  minAvailable?: string | number;
+  selector?: LabelSelector;
+}
+
+export type PodDisruptionBudgetSpec =
+  | V1Beta1PodDisruptionBudgetSpec
+  | V1PodDisruptionBudgetSpec;
+
+export interface V1Beta1PodDisruptionBudgetStatus {
   currentHealthy: number;
   desiredHealthy: number;
   disruptionsAllowed: number;
   expectedPods: number;
 }
 
+export interface V1PodDisruptionBudgetStatus {
+  conditions?: Condition[];
+  currentHealthy: number;
+  desiredHealthy: number;
+  disruptedPods?: Partial<Record<string, string>>;
+  disruptionsAllowed: number;
+  expectedPods: number;
+  observedGeneration?: number;
+}
+
+export type PodDisruptionBudgetStatus =
+  | V1Beta1PodDisruptionBudgetStatus
+  | V1PodDisruptionBudgetStatus;
+
 export class PodDisruptionBudget extends KubeObject<
   NamespaceScopedMetadata,
   PodDisruptionBudgetStatus,
@@ -31,7 +56,7 @@ export class PodDisruptionBudget extends KubeObject<
   static readonly apiBase = "/apis/policy/v1beta1/poddisruptionbudgets";
 
   getSelectors() {
-    return KubeObject.stringifyLabels(this.spec.selector.matchLabels);
+    return KubeObject.stringifyLabels(this.spec.selector?.matchLabels);
   }
 
   getMinAvailable() {

packages/core/src/common/k8s-api/endpoints/types/condition.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+export interface Condition {
+  lastTransitionTime: string;
+  message: string;
+  observedGeneration?: number;
+  reason: string;
+  status: string;
+  type: string;
+}

packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets-details.tsx

@@ -10,70 +10,44 @@ import { observer } from "mobx-react";
 import { DrawerItem } from "../drawer";
 import { Badge } from "../badge";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { PodDisruptionBudget } from "../../../common/k8s-api/endpoints";
-import type { Logger } from "../../../common/logger";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import loggerInjectable from "../../../common/logger.injectable";
+import type { PodDisruptionBudget } from "../../../common/k8s-api/endpoints";
 
 export interface PodDisruptionBudgetDetailsProps extends KubeObjectDetailsProps<PodDisruptionBudget> {
 }
 
-interface Dependencies {
-  logger: Logger;
-}
+export const PodDisruptionBudgetDetails = observer((props: PodDisruptionBudgetDetailsProps) => {
+  const { object: pdb } = props;
 
-@observer
-class NonInjectedPodDisruptionBudgetDetails extends React.Component<PodDisruptionBudgetDetailsProps & Dependencies> {
-
-  render() {
-    const { object: pdb } = this.props;
-
-    if (!pdb) {
-      return null;
-    }
-
-    if (!(pdb instanceof PodDisruptionBudget)) {
-      this.props.logger.error("[PodDisruptionBudgetDetails]: passed object that is not an instanceof PodDisruptionBudget", pdb);
-
-      return null;
-    }
-
-    const selectors = pdb.getSelectors();
-
-    return (
-      <div className="PdbDetails">
-        {selectors.length > 0 && (
-          <DrawerItem name="Selector" labelsOnly>
-            {
-              selectors.map(label => <Badge key={label} label={label}/>)
-            }
-          </DrawerItem>
-        )}
-
-        <DrawerItem name="Min Available">
-          {pdb.getMinAvailable()}
-        </DrawerItem>
-
-        <DrawerItem name="Max Unavailable">
-          {pdb.getMaxUnavailable()}
-        </DrawerItem>
-
-        <DrawerItem name="Current Healthy">
-          {pdb.getCurrentHealthy()}
-        </DrawerItem>
-
-        <DrawerItem name="Desired Healthy">
-          {pdb.getDesiredHealthy()}
-        </DrawerItem>
-
-      </div>
-    );
+  if (!pdb) {
+    return null;
   }
-}
 
-export const PodDisruptionBudgetDetails = withInjectables<Dependencies, PodDisruptionBudgetDetailsProps>(NonInjectedPodDisruptionBudgetDetails, {
-  getProps: (di, props) => ({
-    ...props,
-    logger: di.inject(loggerInjectable),
-  }),
+  const selectors = pdb.getSelectors();
+
+  return (
+    <div className="PdbDetails">
+      {selectors.length > 0 && (
+        <DrawerItem name="Selector" labelsOnly>
+          {selectors.map(label => <Badge key={label} label={label}/>)}
+        </DrawerItem>
+      )}
+
+      <DrawerItem name="Min Available">
+        {pdb.getMinAvailable()}
+      </DrawerItem>
+
+      <DrawerItem name="Max Unavailable">
+        {pdb.getMaxUnavailable()}
+      </DrawerItem>
+
+      <DrawerItem name="Current Healthy">
+        {pdb.getCurrentHealthy()}
+      </DrawerItem>
+
+      <DrawerItem name="Desired Healthy">
+        {pdb.getDesiredHealthy()}
+      </DrawerItem>
+
+    </div>
+  );
 });

packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts

@@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token";
 import { computed } from "mobx";
 import { PodDisruptionBudgetDetails } from "../../../+config-pod-disruption-budgets";
-import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version";
 import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable";
+import { PodDisruptionBudget } from "../../../../../common/k8s-api/endpoints";
 
 const podDisruptionBudgetDetailItemInjectable = getInjectable({
   id: "pod-disruption-budget-detail-item",
@@ -17,7 +17,7 @@ const podDisruptionBudgetDetailItemInjectable = getInjectable({
 
     return {
       Component: PodDisruptionBudgetDetails,
-      enabled: computed(() => isPodDisruptionBudget(kubeObject.value.get()?.object)),
+      enabled: computed(() => kubeObject.value.get()?.object instanceof PodDisruptionBudget),
       orderNumber: 10,
     };
   },
@@ -25,9 +25,4 @@ const podDisruptionBudgetDetailItemInjectable = getInjectable({
   injectionToken: kubeObjectDetailItemInjectionToken,
 });
 
-const isPodDisruptionBudget = kubeObjectMatchesToKindAndApiVersion(
-  "PodDisruptionBudget",
-  ["policy/v1beta1"],
-);
-
 export default podDisruptionBudgetDetailItemInjectable;