refactor PodScope to include ClusterAttributes

Signed-off-by: Jamie Klassen <jamie.klassen@broadcom.com>

plugins/kubernetes-react/api-report.md

@@ -750,7 +750,7 @@ export const PodNamesWithMetricsContext: React_2.Context<
 // @public
 export interface PodScope {
   // (undocumented)
-  clusterName: string;
+  cluster: ClusterAttributes;
   // (undocumented)
   podName: string;
   // (undocumented)

plugins/kubernetes-react/src/components/Pods/FixDialog/FixDialog.tsx

@@ -119,7 +119,7 @@ export const FixDialog: React.FC<FixDialogProps> = ({
                 containerScope={{
                   podName: pod.metadata?.name ?? 'unknown',
                   podNamespace: pod.metadata?.namespace ?? 'unknown',
-                  clusterName: clusterName,
+                  cluster: { name: clusterName },
                   containerName: pf.container,
                 }}
               />

plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.test.tsx

@@ -36,7 +36,7 @@ describe('ContainerCard', () => {
           podScope: {
             name: 'some-name',
             namespace: 'some-namespace',
-            clusterName: 'some-cluster',
+            cluster: { name: 'some-cluster' },
           },
           containerSpec: {
             readinessProbe: {},
@@ -71,7 +71,7 @@ describe('ContainerCard', () => {
           podScope: {
             podName: 'some-name',
             podNamespace: 'some-namespace',
-            clusterName: 'some-cluster',
+            cluster: { name: 'some-cluster' },
           },
           containerSpec: {},
           containerStatus: {
@@ -100,7 +100,7 @@ describe('ContainerCard', () => {
           podScope: {
             podName: 'some-name',
             podNamespace: 'some-namespace',
-            clusterName: 'some-cluster',
+            cluster: { name: 'some-cluster' },
           },
           containerSpec: {},
           containerStatus: {

plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx

@@ -233,7 +233,7 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
         />
         {isPodExecTerminalEnabled && (
           <PodExecTerminalDialog
-            clusterName={podScope.clusterName}
+            clusterName={podScope.cluster.name}
             containerName={containerStatus.name}
             podName={podScope.podName}
             podNamespace={podScope.podNamespace}

plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.tsx

@@ -161,7 +161,7 @@ export const PodDrawer = ({ podAndErrors, open }: PodDrawerProps) => {
                           podName: podAndErrors.pod.metadata?.name ?? 'unknown',
                           podNamespace:
                             podAndErrors.pod.metadata?.namespace ?? 'unknown',
-                          clusterName: podAndErrors.cluster.name,
+                          cluster: podAndErrors.cluster,
                         }}
                         containerSpec={containerSpec}
                         containerStatus={containerStatus}

plugins/kubernetes-react/src/components/Pods/PodLogs/PodLogsDialog.tsx

@@ -42,7 +42,7 @@ export const PodLogsDialog = ({ containerScope }: PodLogsDialogProps) => {
       buttonIcon={<SubjectIcon />}
       buttonText="Logs"
       disabled={false}
-      title={`${containerScope.podName} - ${containerScope.containerName} logs on cluster ${containerScope.clusterName}`}
+      title={`${containerScope.podName} - ${containerScope.containerName} logs on cluster ${containerScope.cluster.name}`}
     >
       <PodLogs containerScope={containerScope} />
     </KubernetesDialog>

plugins/kubernetes-react/src/components/Pods/PodLogs/types.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ClusterAttributes } from '@backstage/plugin-kubernetes-common';
 
 /**
  * Contains the details needed to make a log request to Kubernetes, except the container name
@@ -22,7 +23,7 @@
 export interface PodScope {
   podName: string;
   podNamespace: string;
-  clusterName: string;
+  cluster: ClusterAttributes;
 }
 
 /**

plugins/kubernetes-react/src/components/Pods/PodLogs/usePodLogs.ts

@@ -41,7 +41,7 @@ export const usePodLogs = ({ containerScope, previous }: PodLogsOptions) => {
       podName: containerScope.podName,
       namespace: containerScope.podNamespace,
       containerName: containerScope.containerName,
-      clusterName: containerScope.clusterName,
+      clusterName: containerScope.cluster.name,
       previous,
     });
   }, [JSON.stringify(containerScope)]);