Considered api version while fetching the model for resource kind

Author: lokanandaprabhu

src/components/pipelineRuns-details/utils.ts

@@ -2,15 +2,18 @@ import { PipelineModel } from '../../models';
 import { PipelineRunKind } from '../../types';
 import PipelineResourceRef from '../triggers-details/PipelineResourceRef';
 import { t } from '../utils/common-utils';
+import { groupVersionFor } from '../utils/k8s-utils';
 
 export const convertBackingPipelineToPipelineResourceRefProps = (
   pipelineRun: PipelineRunKind,
 ): React.ComponentProps<typeof PipelineResourceRef> => {
   if (pipelineRun.spec.pipelineRef) {
+    const { version } = groupVersionFor(pipelineRun.apiVersion);
     return {
       resourceKind: PipelineModel.kind,
       resourceName: pipelineRun.spec.pipelineRef.name,
       namespace: pipelineRun.metadata.namespace,
+      resourceApiVersion: version,
     };
   }
 

src/components/pipelines-details/utils.ts

@@ -7,6 +7,7 @@ import {
   ResourceModelLink,
   TektonParam,
 } from '../../types';
+import { groupVersionFor } from '../utils/k8s-utils';
 import { getSafeTaskResourceKind } from '../utils/pipeline-augment';
 
 type PipelineTaskLinks = {
@@ -20,6 +21,7 @@ export const getPipelineTaskLinks = (
   const toResourceLinkData = (tasks: PipelineTask[]): ResourceModelLink[] => {
     const { t } = useTranslation('plugin__pipelines-console-plugin');
     if (!tasks) return [];
+    const { version } = groupVersionFor(pipeline.apiVersion);
     return tasks?.map((task) => {
       if (task.taskRef) {
         if (task.taskRef.resolver === 'cluster') {
@@ -31,13 +33,15 @@ export const getPipelineTaskLinks = (
             name: nameParam,
             qualifier: task.name,
             namespace: PIPELINE_NAMESPACE,
+            resourceApiVersion: version,
           };
         }
         return task.taskRef.kind === 'Task'
           ? {
               resourceKind: getSafeTaskResourceKind(task.taskRef.kind),
               name: task.taskRef.name,
               qualifier: task.name,
+              resourceApiVersion: version,
             }
           : {
               resourceKind: task.taskRef?.kind,

src/components/triggers-details/DynamicResourceLinkList.tsx

@@ -10,6 +10,7 @@ export type ResourceModelLink = {
   qualifier?: string;
   disableLink?: boolean;
   namespace?: string;
+  resourceApiVersion?: string;
 };
 
 type DynamicResourceLinkListProps = {
@@ -44,6 +45,7 @@ const DynamicResourceLinkList: React.FC<DynamicResourceLinkListProps> = ({
               qualifier = '',
               disableLink = false,
               namespace: namespaceForTask,
+              resourceApiVersion,
             }) => {
               let linkName = qualifier;
               if (qualifier?.length > 0 && name !== qualifier) {
@@ -57,6 +59,7 @@ const DynamicResourceLinkList: React.FC<DynamicResourceLinkListProps> = ({
                     displayName={linkName}
                     namespace={namespaceForTask || namespace}
                     disableLink={disableLink}
+                    resourceApiVersion={resourceApiVersion}
                   />
                 </div>
               );

src/components/triggers-details/PipelineResourceRef.tsx

@@ -10,7 +10,11 @@ import { getReferenceForModel } from '../pipelines-overview/utils';
 import './PipelineResourceRef.scss';
 
 const MODEL_KINDS = Object.values(models).reduce(
-  (acc, model: K8sKind) => ({ ...acc, [model.kind]: model }),
+  (acc, model: K8sKind) => ({
+    ...acc,
+    [`${model.kind}-${model.apiVersion}`]: model,
+    [model.kind]: model,
+  }),
   {},
 );
 
@@ -21,6 +25,7 @@ type PipelineResourceRefProps = {
   displayName?: string;
   largeIcon?: boolean;
   namespace?: string;
+  resourceApiVersion?: string;
 };
 
 const PipelineResourceRef: React.FC<PipelineResourceRefProps> = ({
@@ -30,8 +35,14 @@ const PipelineResourceRef: React.FC<PipelineResourceRefProps> = ({
   namespace,
   resourceKind,
   resourceName,
+  resourceApiVersion,
 }) => {
-  const model: K8sKind | undefined = MODEL_KINDS[resourceKind];
+  const modelKey = resourceApiVersion
+    ? `${resourceKind}-${resourceApiVersion}`
+    : resourceKind;
+  const model: K8sKind | undefined =
+    MODEL_KINDS[modelKey] || MODEL_KINDS[resourceKind];
+
   let kind = resourceKind;
   if (model) {
     kind = getReferenceForModel(model);