From f8642c16185ab7f88611fa4bf64f27c4f668952b Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Thu, 5 Nov 2020 12:55:20 +0200 Subject: [PATCH] Move KubeObjectStatusText under K8sApi namespace Signed-off-by: Lauri Nevala --- .../kube-object-event-status/src/resolver.tsx | 14 +++++++------- src/extensions/renderer-api/k8s-api.ts | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/extensions/kube-object-event-status/src/resolver.tsx b/extensions/kube-object-event-status/src/resolver.tsx index cb2c122d0f..ee83293815 100644 --- a/extensions/kube-object-event-status/src/resolver.tsx +++ b/extensions/kube-object-event-status/src/resolver.tsx @@ -1,6 +1,6 @@ -import { KubeObjectStatus, K8sApi } from "@k8slens/extensions"; +import { K8sApi } from "@k8slens/extensions"; -export function resolveStatus(object: K8sApi.KubeObject): KubeObjectStatus.Status { +export function resolveStatus(object: K8sApi.KubeObject): K8sApi.KubeObjectStatus { const eventStore = K8sApi.apiManager.getStore(K8sApi.eventApi) const events = (eventStore as K8sApi.EventStore).getEventsByObject(object); let warnings = events.filter(evt => evt.isWarning()); @@ -9,13 +9,13 @@ export function resolveStatus(object: K8sApi.KubeObject): KubeObjectStatus.Statu } const event = [...warnings, ...events][0]; // get latest event return { - level: KubeObjectStatus.Level.WARNING, + level: K8sApi.KubeObjectStatusLevel.WARNING, text: `${event.message}`, timestamp: event.metadata.creationTimestamp } } -export function resolveStatusForPods(pod: K8sApi.Pod): KubeObjectStatus.Status { +export function resolveStatusForPods(pod: K8sApi.Pod): K8sApi.KubeObjectStatus { if (!pod.hasIssues()) { return null } @@ -27,13 +27,13 @@ export function resolveStatusForPods(pod: K8sApi.Pod): KubeObjectStatus.Status { } const event = [...warnings, ...events][0]; // get latest event return { - level: KubeObjectStatus.Level.WARNING, + level: K8sApi.KubeObjectStatusLevel.WARNING, text: `${event.message}`, timestamp: event.metadata.creationTimestamp } } -export function resolveStatusForCronJobs(cronJob: K8sApi.CronJob): KubeObjectStatus.Status { +export function resolveStatusForCronJobs(cronJob: K8sApi.CronJob): K8sApi.KubeObjectStatus { const eventStore = K8sApi.apiManager.getStore(K8sApi.eventApi) let events = (eventStore as K8sApi.EventStore).getEventsByObject(cronJob); let warnings = events.filter(evt => evt.isWarning()); @@ -45,7 +45,7 @@ export function resolveStatusForCronJobs(cronJob: K8sApi.CronJob): KubeObjectSta } const event = [...warnings, ...events][0]; // get latest event return { - level: KubeObjectStatus.Level.WARNING, + level: K8sApi.KubeObjectStatusLevel.WARNING, text: `${event.message}`, timestamp: event.metadata.creationTimestamp } diff --git a/src/extensions/renderer-api/k8s-api.ts b/src/extensions/renderer-api/k8s-api.ts index 3442fa125f..04ab738078 100644 --- a/src/extensions/renderer-api/k8s-api.ts +++ b/src/extensions/renderer-api/k8s-api.ts @@ -30,3 +30,4 @@ export { Role, roleApi } from "../../renderer/api/endpoints"; export { RoleBinding, roleBindingApi } from "../../renderer/api/endpoints"; export { ClusterRole, clusterRoleApi } from "../../renderer/api/endpoints"; export { ClusterRoleBinding, clusterRoleBindingApi } from "../../renderer/api/endpoints"; +export { KubeObjectStatus, KubeObjectStatusLevel } from "../registries/kube-object-status-registry"