From 5b15d126f0c770adb521f396ab26881d23c46141 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 24 Oct 2022 12:12:49 -0400 Subject: [PATCH] Remove legacy KubeObjectMeta use from non-metrics details Signed-off-by: Sebastian Malton --- src/renderer/components/+config-leases/lease-details.tsx | 3 --- .../components/+config-limit-ranges/limit-range-details.tsx | 3 --- src/renderer/components/+config-maps/config-map-details.tsx | 2 -- .../pod-disruption-budgets-details.tsx | 3 --- .../+config-priority-classes/priority-classes-details.tsx | 3 --- .../+config-resource-quotas/resource-quota-details.tsx | 3 --- .../+config-runtime-classes/runtime-classes-details.tsx | 3 --- src/renderer/components/+config-secrets/secret-details.tsx | 2 -- src/renderer/components/+custom-resources/crd-details.tsx | 3 --- src/renderer/components/+events/event-details.tsx | 3 --- .../components/+network-endpoints/endpoint-details.tsx | 2 -- .../components/+network-policies/network-policy-details.tsx | 3 --- src/renderer/components/+network-services/service-details.tsx | 3 --- .../+pod-security-policies/pod-security-policy-details.tsx | 3 --- .../components/+storage-classes/storage-class-details.tsx | 3 --- src/renderer/components/+storage-volumes/volume-details.tsx | 2 -- .../+user-management/+cluster-role-bindings/details.tsx | 3 --- .../components/+user-management/+cluster-roles/details.tsx | 3 --- .../components/+user-management/+role-bindings/details.tsx | 3 --- src/renderer/components/+user-management/+roles/details.tsx | 2 -- .../components/+user-management/+service-accounts/details.tsx | 3 --- 21 files changed, 58 deletions(-) diff --git a/src/renderer/components/+config-leases/lease-details.tsx b/src/renderer/components/+config-leases/lease-details.tsx index 617021edbf..d86ecabaf8 100644 --- a/src/renderer/components/+config-leases/lease-details.tsx +++ b/src/renderer/components/+config-leases/lease-details.tsx @@ -9,7 +9,6 @@ import React from "react"; import { observer } from "mobx-react"; import { DrawerItem } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { KubeObjectMeta } from "../kube-object-meta"; import type { Lease } from "../../../common/k8s-api/endpoints"; export interface LeaseDetailsProps extends KubeObjectDetailsProps { @@ -23,8 +22,6 @@ export class LeaseDetails extends React.Component { return (
- - {lease.getHolderIdentity()} diff --git a/src/renderer/components/+config-limit-ranges/limit-range-details.tsx b/src/renderer/components/+config-limit-ranges/limit-range-details.tsx index 313da25667..2da12a3d31 100644 --- a/src/renderer/components/+config-limit-ranges/limit-range-details.tsx +++ b/src/renderer/components/+config-limit-ranges/limit-range-details.tsx @@ -10,7 +10,6 @@ import { observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { LimitRangeItem } from "../../../common/k8s-api/endpoints/limit-range.api"; import { LimitPart, LimitRange, Resource } from "../../../common/k8s-api/endpoints/limit-range.api"; -import { KubeObjectMeta } from "../kube-object-meta"; import { DrawerItem } from "../drawer/drawer-item"; import { Badge } from "../badge"; import logger from "../../../common/logger"; @@ -73,8 +72,6 @@ export class LimitRangeDetails extends React.Component { return (
- - {containerLimits.length > 0 && ( { diff --git a/src/renderer/components/+config-maps/config-map-details.tsx b/src/renderer/components/+config-maps/config-map-details.tsx index 36c479ad99..f5b4007281 100644 --- a/src/renderer/components/+config-maps/config-map-details.tsx +++ b/src/renderer/components/+config-maps/config-map-details.tsx @@ -14,7 +14,6 @@ import { Input } from "../input"; import { Button } from "../button"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { ConfigMap } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import type { Logger } from "../../../common/logger"; import type { ConfigMapStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -95,7 +94,6 @@ class NonInjectedConfigMapDetails extends React.Component - { data.length > 0 && ( <> diff --git a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets-details.tsx b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets-details.tsx index 901daf5411..b58a42b0d9 100644 --- a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets-details.tsx +++ b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets-details.tsx @@ -11,7 +11,6 @@ import { DrawerItem } from "../drawer"; import { Badge } from "../badge"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { PodDisruptionBudget } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; export interface PodDisruptionBudgetDetailsProps extends KubeObjectDetailsProps { @@ -37,8 +36,6 @@ export class PodDisruptionBudgetDetails extends React.Component - - {selectors.length > 0 && ( { diff --git a/src/renderer/components/+config-priority-classes/priority-classes-details.tsx b/src/renderer/components/+config-priority-classes/priority-classes-details.tsx index 5bfcc4ca07..7caf5190a1 100644 --- a/src/renderer/components/+config-priority-classes/priority-classes-details.tsx +++ b/src/renderer/components/+config-priority-classes/priority-classes-details.tsx @@ -10,7 +10,6 @@ import { observer } from "mobx-react"; import { DrawerItem } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { PriorityClass } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; export interface PriorityClassesDetailsProps extends KubeObjectDetailsProps { } @@ -23,8 +22,6 @@ export class PriorityClassesDetails extends React.Component - - {pc.getDescription()} diff --git a/src/renderer/components/+config-resource-quotas/resource-quota-details.tsx b/src/renderer/components/+config-resource-quotas/resource-quota-details.tsx index 30a7d3496c..c02f9b221b 100644 --- a/src/renderer/components/+config-resource-quotas/resource-quota-details.tsx +++ b/src/renderer/components/+config-resource-quotas/resource-quota-details.tsx @@ -13,7 +13,6 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { ResourceQuota } from "../../../common/k8s-api/endpoints/resource-quota.api"; import { LineProgress } from "../line-progress"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; export interface ResourceQuotaDetailsProps extends KubeObjectDetailsProps { @@ -93,8 +92,6 @@ export class ResourceQuotaDetails extends React.Component - - {renderQuotas(quota)} diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx index 309c2a73bd..f6fc61faeb 100644 --- a/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx +++ b/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx @@ -10,7 +10,6 @@ import { observer } from "mobx-react"; import { DrawerItem } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { RuntimeClass } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import { Badge } from "../badge"; import { RuntimeClassDetailsTolerations } from "./runtime-classes-details-tolerations"; @@ -26,8 +25,6 @@ export class RuntimeClassesDetails extends React.Component - - {rc.getHandler()} diff --git a/src/renderer/components/+config-secrets/secret-details.tsx b/src/renderer/components/+config-secrets/secret-details.tsx index c22f7befe8..6b4873f187 100644 --- a/src/renderer/components/+config-secrets/secret-details.tsx +++ b/src/renderer/components/+config-secrets/secret-details.tsx @@ -16,7 +16,6 @@ import { base64, toggle } from "../../utils"; import { Icon } from "../icon"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Secret } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import type { Logger } from "../../../common/logger"; import type { SecretStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -161,7 +160,6 @@ class NonInjectedSecretDetails extends React.Component - {secret.type} diff --git a/src/renderer/components/+custom-resources/crd-details.tsx b/src/renderer/components/+custom-resources/crd-details.tsx index 09676c2101..d3023a020e 100644 --- a/src/renderer/components/+custom-resources/crd-details.tsx +++ b/src/renderer/components/+custom-resources/crd-details.tsx @@ -14,7 +14,6 @@ import { DrawerItem, DrawerTitle } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { Input } from "../input"; -import { KubeObjectMeta } from "../kube-object-meta"; import { MonacoEditor } from "../monaco-editor"; import logger from "../../../common/logger"; @@ -42,8 +41,6 @@ export class CRDDetails extends React.Component { return (
- - {crd.getGroup()} diff --git a/src/renderer/components/+events/event-details.tsx b/src/renderer/components/+events/event-details.tsx index cf45d7a666..5334744054 100644 --- a/src/renderer/components/+events/event-details.tsx +++ b/src/renderer/components/+events/event-details.tsx @@ -12,7 +12,6 @@ import { Link } from "react-router-dom"; import { observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { KubeEvent } from "../../../common/k8s-api/endpoints/events.api"; -import { KubeObjectMeta } from "../kube-object-meta"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import logger from "../../../common/logger"; @@ -52,8 +51,6 @@ const NonInjectedEventDetails = observer(({ return (
- - {message} diff --git a/src/renderer/components/+network-endpoints/endpoint-details.tsx b/src/renderer/components/+network-endpoints/endpoint-details.tsx index 3821c68047..4e014595b7 100644 --- a/src/renderer/components/+network-endpoints/endpoint-details.tsx +++ b/src/renderer/components/+network-endpoints/endpoint-details.tsx @@ -10,7 +10,6 @@ import { observer } from "mobx-react"; import { DrawerTitle } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Endpoints } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import { EndpointSubsetList } from "./endpoint-subset-list"; import logger from "../../../common/logger"; @@ -34,7 +33,6 @@ export class EndpointsDetails extends React.Component { return (
- Subsets { endpoint.getEndpointSubsets().map((subset) => ( diff --git a/src/renderer/components/+network-policies/network-policy-details.tsx b/src/renderer/components/+network-policies/network-policy-details.tsx index 264d626ba9..60eec92e91 100644 --- a/src/renderer/components/+network-policies/network-policy-details.tsx +++ b/src/renderer/components/+network-policies/network-policy-details.tsx @@ -13,7 +13,6 @@ import { Badge } from "../badge"; import { SubTitle } from "../layout/sub-title"; import { observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; import type { LabelMatchExpression, LabelSelector } from "../../../common/k8s-api/kube-object"; import { isEmpty } from "lodash"; @@ -170,8 +169,6 @@ export class NetworkPolicyDetails extends React.Component - - 0}> { selector.length > 0 diff --git a/src/renderer/components/+network-services/service-details.tsx b/src/renderer/components/+network-services/service-details.tsx index 61a45c4040..998a8c6576 100644 --- a/src/renderer/components/+network-services/service-details.tsx +++ b/src/renderer/components/+network-services/service-details.tsx @@ -11,7 +11,6 @@ import { DrawerItem, DrawerTitle } from "../drawer"; import { Badge } from "../badge"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Service } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import { ServicePortComponent } from "./service-port-component"; import type { EndpointsStore } from "../+network-endpoints/store"; import { ServiceDetailsEndpoint } from "./service-details-endpoint"; @@ -75,8 +74,6 @@ class NonInjectedServiceDetails extends React.Component - - {service.getSelector().map(selector => )} diff --git a/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx b/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx index 775eb02680..03cce618a0 100644 --- a/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx +++ b/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx @@ -12,7 +12,6 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { PodSecurityPolicy } from "../../../common/k8s-api/endpoints"; import { Badge } from "../badge"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; export interface PodSecurityPolicyDetailsProps extends KubeObjectDetailsProps { @@ -74,8 +73,6 @@ export class PodSecurityPolicyDetails extends React.Component - - {allowedCapabilities && ( {allowedCapabilities.join(", ")} diff --git a/src/renderer/components/+storage-classes/storage-class-details.tsx b/src/renderer/components/+storage-classes/storage-class-details.tsx index 2a6202845d..0df28e13f8 100644 --- a/src/renderer/components/+storage-classes/storage-class-details.tsx +++ b/src/renderer/components/+storage-classes/storage-class-details.tsx @@ -12,7 +12,6 @@ import { Badge } from "../badge"; import { disposeOnUnmount, observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { StorageClass } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import type { StorageClassStore } from "./store"; import { VolumeDetailsList } from "../+storage-volumes/volume-details-list"; import type { PersistentVolumeStore } from "../+storage-volumes/store"; @@ -60,8 +59,6 @@ class NonInjectedStorageClassDetails extends React.Component - - {provisioner && ( diff --git a/src/renderer/components/+storage-volumes/volume-details.tsx b/src/renderer/components/+storage-volumes/volume-details.tsx index 32ab0c5307..6fd6a52eaf 100644 --- a/src/renderer/components/+storage-volumes/volume-details.tsx +++ b/src/renderer/components/+storage-volumes/volume-details.tsx @@ -13,7 +13,6 @@ import { DrawerItem, DrawerTitle } from "../drawer"; import { Badge } from "../badge"; import { PersistentVolume, persistentVolumeClaimApi, storageClassApi } from "../../../common/k8s-api/endpoints"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { KubeObjectMeta } from "../kube-object-meta"; import { getDetailsUrl } from "../kube-detail-params"; import logger from "../../../common/logger"; import { stopPropagation } from "../../../renderer/utils"; @@ -44,7 +43,6 @@ export class PersistentVolumeDetails extends React.Component - {capacity?.storage} diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx index 7fcb29094b..d78bae4fb1 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx +++ b/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx @@ -14,7 +14,6 @@ import { autoBind, ObservableHashSet, prevDefault } from "../../../utils"; import { AddRemoveButtons } from "../../add-remove-buttons"; import { DrawerTitle } from "../../drawer"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; -import { KubeObjectMeta } from "../../kube-object-meta"; import { Table, TableCell, TableHead, TableRow } from "../../table"; import { ClusterRoleBindingDialog } from "./dialog"; import { clusterRoleBindingStore } from "./legacy-store"; @@ -76,8 +75,6 @@ class NonInjectedClusterRoleBindingDetails extends React.Component - - Reference diff --git a/src/renderer/components/+user-management/+cluster-roles/details.tsx b/src/renderer/components/+user-management/+cluster-roles/details.tsx index f06e9785d1..fa0e21143e 100644 --- a/src/renderer/components/+user-management/+cluster-roles/details.tsx +++ b/src/renderer/components/+user-management/+cluster-roles/details.tsx @@ -10,7 +10,6 @@ import React from "react"; import { DrawerTitle } from "../../drawer"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; -import { KubeObjectMeta } from "../../kube-object-meta"; import type { ClusterRole } from "../../../../common/k8s-api/endpoints"; export interface ClusterRoleDetailsProps extends KubeObjectDetailsProps { @@ -26,8 +25,6 @@ export class ClusterRoleDetails extends React.Component return (
- - Rules {rules.map(({ resourceNames, apiGroups, resources, verbs }, index) => { return ( diff --git a/src/renderer/components/+user-management/+role-bindings/details.tsx b/src/renderer/components/+user-management/+role-bindings/details.tsx index bf0f573b5e..eeadae080c 100644 --- a/src/renderer/components/+user-management/+role-bindings/details.tsx +++ b/src/renderer/components/+user-management/+role-bindings/details.tsx @@ -13,7 +13,6 @@ import { prevDefault } from "../../../utils"; import { AddRemoveButtons } from "../../add-remove-buttons"; import { DrawerTitle } from "../../drawer"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; -import { KubeObjectMeta } from "../../kube-object-meta"; import { Table, TableCell, TableHead, TableRow } from "../../table"; import { RoleBindingDialog } from "./dialog"; import { roleBindingStore } from "./legacy-store"; @@ -71,8 +70,6 @@ class NonInjectedRoleBindingDetails extends React.Component - - Reference
diff --git a/src/renderer/components/+user-management/+roles/details.tsx b/src/renderer/components/+user-management/+roles/details.tsx index 0f24e9e711..9257d7095e 100644 --- a/src/renderer/components/+user-management/+roles/details.tsx +++ b/src/renderer/components/+user-management/+roles/details.tsx @@ -11,7 +11,6 @@ import React from "react"; import type { Role } from "../../../../common/k8s-api/endpoints"; import { DrawerTitle } from "../../drawer"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; -import { KubeObjectMeta } from "../../kube-object-meta"; export interface RoleDetailsProps extends KubeObjectDetailsProps { } @@ -26,7 +25,6 @@ export class RoleDetails extends React.Component { return (
- Rules {rules.map(({ resourceNames, apiGroups, resources, verbs }, index) => { return ( diff --git a/src/renderer/components/+user-management/+service-accounts/details.tsx b/src/renderer/components/+user-management/+service-accounts/details.tsx index 788be09e54..2c0bec0f0a 100644 --- a/src/renderer/components/+user-management/+service-accounts/details.tsx +++ b/src/renderer/components/+user-management/+service-accounts/details.tsx @@ -14,7 +14,6 @@ import type { Secret, ServiceAccount } from "../../../../common/k8s-api/endpoint import { DrawerItem, DrawerTitle } from "../../drawer"; import { Icon } from "../../icon"; import type { KubeObjectDetailsProps } from "../../kube-object-details"; -import { KubeObjectMeta } from "../../kube-object-meta"; import { Spinner } from "../../spinner"; import { ServiceAccountsSecret } from "./secret"; import type { SecretStore } from "../../+config-secrets/store"; @@ -137,8 +136,6 @@ class NonInjectedServiceAccountsDetails extends React.Component - - {tokens.length > 0 && ( {this.renderSecretLinks(tokens)}