diff --git a/frontend/packages/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap b/frontend/packages/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap index 6c5f16d7270..7930f95e79a 100644 --- a/frontend/packages/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap +++ b/frontend/packages/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap @@ -317,7 +317,7 @@ Object { "annotations": Object { "openshift.io/scc": "restricted", }, - "creationTimestaResourcePropsmp": "2019-04-26T10:23:41Z", + "creationTimestamp": "2019-04-26T10:23:41Z", "generateName": "analytics-deployment-59dd7c47d4-", "labels": Object { "app.kubernetes.io/component": "backend", @@ -444,7 +444,7 @@ Object { "annotations": Object { "openshift.io/scc": "restricted", }, - "creationTimestaResourcePropsmp": "2019-04-26T10:23:41Z", + "creationTimestamp": "2019-04-26T10:23:41Z", "generateName": "analytics-deployment-59dd7c47d4-", "labels": Object { "app.kubernetes.io/component": "backend", diff --git a/frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts b/frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts index 82d9cff40f6..c569384468e 100644 --- a/frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts +++ b/frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts @@ -199,7 +199,7 @@ export const samplePods: Resource = { resourceVersion: '1395096', name: 'analytics-deployment-59dd7c47d4-2jp7t', uid: '5cec460e-680d-11e9-8c69-5254003f9382', - creationTimestaResourcePropsmp: '2019-04-26T10:23:41Z', + creationTimestamp: '2019-04-26T10:23:41Z', namespace: 'testproject3', ownerReferences: [ { diff --git a/frontend/packages/operator-lifecycle-manager/mocks.ts b/frontend/packages/operator-lifecycle-manager/mocks.ts index fcaee14aed5..5717b300914 100644 --- a/frontend/packages/operator-lifecycle-manager/mocks.ts +++ b/frontend/packages/operator-lifecycle-manager/mocks.ts @@ -327,8 +327,8 @@ export const testOperatorDeployment: K8sResourceKind = { apiVersion: testClusterServiceVersion.apiVersion, }, ], - spec: {}, }, + spec: {}, }; export const testSubscription: SubscriptionKind = { diff --git a/frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx b/frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx index 5fdb8462557..e8f7d903988 100644 --- a/frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx +++ b/frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx @@ -72,7 +72,7 @@ export const OperatorHubList: React.SFC = (props) => { longDescription: currentCSVDesc.description || currentCSVAnnotations.description, provider: _.get(pkg, 'status.provider.name', _.get(pkg, 'metadata.labels.provider')), providerType: getOperatorProviderType(pkg), - tags: pkg.metadata.tags, + tags: [], version: _.get(currentCSVDesc, 'version'), categories: _.get(currentCSVAnnotations, 'categories', '') .split(',') diff --git a/frontend/public/components/catalog/catalog-page.tsx b/frontend/public/components/catalog/catalog-page.tsx index d09a5d94434..8aaf1f32b0c 100644 --- a/frontend/public/components/catalog/catalog-page.tsx +++ b/frontend/public/components/catalog/catalog-page.tsx @@ -4,7 +4,7 @@ import { Helmet } from 'react-helmet'; import { ANNOTATIONS, FLAGS } from '../../const'; import { CatalogTileViewPage } from './catalog-items'; -import { k8sListPartialMetadata, referenceForModel, serviceClassDisplayName, K8sResourceKind, ObjectMetadata } from '../../module/k8s'; +import { k8sListPartialMetadata, referenceForModel, serviceClassDisplayName, K8sResourceKind, PartialObjectMetadata } from '../../module/k8s'; import { withStartGuide } from '../start-guide'; import { connectToFlags, flagPending } from '../../reducers/features'; import { Firehose, LoadError, PageHeading, skeletonCatalog, StatusBox, FirehoseResult } from '../utils'; @@ -286,8 +286,8 @@ export const CatalogPage = withStartGuide(({match, noProjectsAvailable}) => { export type CatalogListPageProps = { clusterServiceClasses?: FirehoseResult; imageStreams?: FirehoseResult; - templateMetadata?: ObjectMetadata[]; - projectTemplateMetadata?: ObjectMetadata[]; + templateMetadata?: PartialObjectMetadata[]; + projectTemplateMetadata?: PartialObjectMetadata[]; loaded: boolean; loadError?: string; namespace?: string; diff --git a/frontend/public/module/k8s/index.ts b/frontend/public/module/k8s/index.ts index 772eec83f75..9ce2080fdf1 100644 --- a/frontend/public/module/k8s/index.ts +++ b/frontend/public/module/k8s/index.ts @@ -36,16 +36,28 @@ export type ObjectReference = { }; export type ObjectMetadata = { - name?: string; + annotations?: {[key: string]: string}; + clusterName?: string; + creationTimestamp?: string; + deletionGracePeriodSeconds?: number; + deletionTimestamp?: string; + finalizers?: string[]; generateName?: string; - uid?: string; - annotations?: {[key: string]: string}, - namespace?: string, + generation?: number; labels?: {[key: string]: string}, - ownerReferences?: OwnerReference[], - deletionTimestamp?: string; - creationTimestamp?: string; - [key: string]: any, + managedFields?: any[]; + name?: string; + namespace?: string; + ownerReferences?: OwnerReference[]; + resourceVersion?: string; + selfLink?: string; + uid?: string; +}; + +export type PartialObjectMetadata = { + apiVersion: string; + kind: string; + metadata: ObjectMetadata; }; export enum K8sResourceConditionStatus {