chore: resolve merge errors

Signed-off-by: Nathan Klick <[email protected]>

Author: nathanklick

src/core/kube/k8_client.ts

@@ -32,7 +32,6 @@ import {type Namespaces} from './namespaces.js';
 import {NamespaceName} from './namespace_name.js';
 import K8ClientClusters from './k8_client/k8_client_clusters.js';
 import {type Clusters} from './clusters.js';
-import {PodRef} from './pod_ref.js';
 import {type ConfigMaps} from './config_maps.js';
 import K8ClientConfigMaps from './k8_client/k8_client_config_maps.js';
 import {PodRef} from './pod_ref.js';

src/core/kube/pod_name.ts

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import {isDns1123Label} from './kube_validation.js';
-import {PodNameInvalidError} from './kube_errors.js';
+import {PodNameInvalidError} from './errors/namespace_name_invalid_error.js';
 
 /**
  * Represents a Kubernetes pod name. A Kubernetes pod name must be a valid RFC-1123 DNS label.

src/core/kube/pod_ref.ts

@@ -1,9 +1,9 @@
 /**
  * SPDX-License-Identifier: Apache-2.0
  */
-import {MissingNamespaceNameError, MissingPodNameError} from './kube_errors.js';
 import {type PodName} from './pod_name.js';
 import {type NamespaceName} from './namespace_name.js';
+import {MissingNamespaceNameError, MissingPodNameError} from './errors/namespace_name_invalid_error.js';
 
 /**
  * Represents a Kubernetes pod reference which includes the namespace name and pod name.