From 99fffed216b5f2f0030627b45cea7c20e9c72fbd Mon Sep 17 00:00:00 2001
From: Moustafa Baiou <moustafab.ccit@gmail.com>
Date: Sat, 7 Nov 2020 19:44:19 -0500
Subject: [PATCH] fix types

---
 .../src/kinds/ComponentEntityV1alpha1.ts         | 16 ++++++++++++++++
 .../KubernetesContent/KubernetesContent.tsx      | 10 ++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
index 9d46dea03f..0e1e369e44 100644
--- a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
@@ -30,6 +30,15 @@ const schema = yup.object<Partial<ComponentEntityV1alpha1>>({
       lifecycle: yup.string().required().min(1),
       owner: yup.string().required().min(1),
       implementsApis: yup.array(yup.string().required()).notRequired(),
+      kubernetes: yup
+        .object<any>({
+          selector: yup
+            .object<any>({
+              matchLabels: yup.object<any>().required(),
+            })
+            .required(),
+        })
+        .notRequired(),
     })
     .required(),
 });
@@ -42,6 +51,13 @@ export interface ComponentEntityV1alpha1 extends Entity {
     lifecycle: string;
     owner: string;
     implementsApis?: string[];
+    kubernetes?: {
+      selector: {
+        matchLabels: {
+          [key: string]: string;
+        };
+      };
+    };
   };
 }
 
diff --git a/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx b/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
index d46a888b39..3f9c1a866f 100644
--- a/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
+++ b/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
@@ -26,7 +26,7 @@ import {
   TabbedCard,
   useApi,
 } from '@backstage/core';
-import { Entity } from '@backstage/catalog-model';
+import { ComponentEntityV1alpha1, Entity } from '@backstage/catalog-model';
 import { kubernetesApiRef } from '../../api/types';
 import {
   AuthRequestBody,
@@ -137,11 +137,13 @@ export const KubernetesContent = ({ entity }: KubernetesContentProps) => {
         },
       };
 
+      const componentEntity = entity as ComponentEntityV1alpha1;
       if (
-        entity.spec.kubernetes &&
-        (entity.spec.kubernetes.selector as V1LabelSelector)
+        componentEntity.spec &&
+        componentEntity.spec.kubernetes &&
+        (componentEntity.spec.kubernetes.selector as V1LabelSelector)
       ) {
-        labelSelector = entity.spec.kubernetes.selector;
+        labelSelector = componentEntity.spec.kubernetes.selector;
       }
 
       // TODO: Add validation on contents/format of requestBody