update apiVersion for eventing resources wrt serverless 1.10

openshift · Nov 6, 2020 · ca727d9 · ca727d9
1 parent ce5da0b
commit ca727d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/frontend/packages/knative-plugin/src/models.ts b/frontend/packages/knative-plugin/src/models.ts
@@ -128,7 +128,7 @@ export const EventSourcePingModel: K8sKind = {
 
 export const EventSourceContainerModel: K8sKind = {
   apiGroup: KNATIVE_EVENT_SOURCE_APIGROUP_DEP,
-  apiVersion: 'v1alpha1',
+  apiVersion: 'v1alpha2',
   kind: 'ContainerSource',
   label: 'Container Source',
   labelPlural: 'Container Sources',
@@ -142,7 +142,7 @@ export const EventSourceContainerModel: K8sKind = {
 
 export const EventSourceApiServerModel: K8sKind = {
   apiGroup: KNATIVE_EVENT_SOURCE_APIGROUP,
-  apiVersion: 'v1alpha1',
+  apiVersion: 'v1alpha2',
   kind: 'ApiServerSource',
   label: 'ApiServerSource',
   labelPlural: 'ApiServerSources',
@@ -198,7 +198,7 @@ export const EventSourceSinkBindingModel: K8sKind = {
 
 export const EventingSubscriptionModel: K8sKind = {
   apiGroup: KNATIVE_EVENT_MESSAGE_APIGROUP,
-  apiVersion: 'v1',
+  apiVersion,
   kind: 'Subscription',
   label: 'Subscription',
   labelPlural: 'Subscriptions',
@@ -212,7 +212,7 @@ export const EventingSubscriptionModel: K8sKind = {
 
 export const EventingIMCModel: K8sKind = {
   apiGroup: KNATIVE_EVENT_MESSAGE_APIGROUP,
-  apiVersion: 'v1beta1',
+  apiVersion,
   kind: 'InMemoryChannel',
   label: 'InMemoryChannel',
   labelPlural: 'inmemorychannels',
@@ -226,7 +226,7 @@ export const EventingIMCModel: K8sKind = {
 
 export const EventingChannelModel: K8sKind = {
   apiGroup: KNATIVE_EVENT_MESSAGE_APIGROUP,
-  apiVersion: 'v1beta1',
+  apiVersion,
   kind: 'Channel',
   label: 'Channel',
   labelPlural: 'channels',
@@ -254,7 +254,7 @@ export const EventingKafkaChannelModel: K8sKind = {
 
 export const EventingBrokerModel: K8sKind = {
   apiGroup: KNATIVE_EVENTING_APIGROUP,
-  apiVersion: 'v1beta1',
+  apiVersion,
   kind: 'Broker',
   label: 'Broker',
   labelPlural: 'Brokers',
@@ -268,7 +268,7 @@ export const EventingBrokerModel: K8sKind = {
 
 export const EventingTriggerModel: K8sKind = {
   apiGroup: KNATIVE_EVENTING_APIGROUP,
-  apiVersion: 'v1',
+  apiVersion,
   kind: 'Trigger',
   label: 'Trigger',
   labelPlural: 'Triggers',
@@ -282,7 +282,7 @@ export const EventingTriggerModel: K8sKind = {
 
 export const CamelIntegrationModel: K8sKind = {
   apiGroup: 'camel.apache.org',
-  apiVersion: 'v1',
+  apiVersion,
   kind: 'Integration',
   label: 'Integration',
   labelPlural: 'Integrations',

diff --git a/frontend/packages/knative-plugin/src/topology/knative-topology-utils.ts b/frontend/packages/knative-plugin/src/topology/knative-topology-utils.ts
@@ -175,9 +175,7 @@ const isSubscriber = (
   const channelRef = relatedResource?.spec?.channel;
   if (
     channelRef &&
-    (mainResource.metadata.name !== channelRef.name ||
-      mainResource.kind !== channelRef.kind ||
-      mainResource.apiVersion !== channelRef.apiVersion)
+    (mainResource.metadata.name !== channelRef.name || mainResource.kind !== channelRef.kind)
   ) {
     return false;
   }
@@ -193,12 +191,8 @@ const isPublisher = (
   relationshipResource: K8sResourceKind,
   mainResource: K8sResourceKind,
 ): boolean => {
-  const { name, kind, apiVersion } = relationshipResource.spec?.subscriber?.ref || {};
-  if (
-    mainResource.metadata.name !== name ||
-    mainResource.kind !== kind ||
-    mainResource.apiVersion !== apiVersion
-  ) {
+  const { name, kind } = relationshipResource.spec?.subscriber?.ref || {};
+  if (mainResource.metadata.name !== name || mainResource.kind !== kind) {
     return false;
   }
   if (relationshipResource.kind === EventingTriggerModel.kind) {