Fix trigger annotation

openshift · Feb 22, 2021 · d6df541 · d6df541
1 parent cf684ab
commit d6df541
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts b/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts
@@ -161,6 +161,7 @@ export const createOrUpdateDeployment = (
     ...annotations,
     'alpha.image.policy.openshift.io/resolve-names': '*',
     ...getTriggerAnnotation(
+      name,
       imgName || name,
       imgNamespace || namespace,
       imageChange,
@@ -440,6 +441,7 @@ export const createOrUpdateDeployImageResources = async (
     }
     const originalAnnotations = appResources?.editAppResource?.data?.metadata?.annotations || {};
     const triggerAnnotations = getTriggerAnnotation(
+      name,
       internalImageStreamName || name,
       internalImageStreamNamespace || namespace,
       imageChange,

diff --git a/frontend/packages/dev-console/src/components/import/import-submit-utils.ts b/frontend/packages/dev-console/src/components/import/import-submit-utils.ts
@@ -265,11 +265,12 @@ export const createOrUpdateDeployment = (
 
   const imageStreamName = imageStream && imageStream.metadata.name;
   const defaultLabels = getAppLabels({ name, applicationName, imageStreamName, selectedTag });
+  const imageName = name;
   const annotations = {
     ...getGitAnnotations(repository, ref),
     ...getCommonAnnotations(),
     'alpha.image.policy.openshift.io/resolve-names': '*',
-    ...getTriggerAnnotation(name, namespace, imageChange),
+    ...getTriggerAnnotation(name, imageName, namespace, imageChange),
   };
   const podLabels = getPodLabels(name);
   const templateLabels = getTemplateLabels(originalDeployment);
@@ -632,6 +633,7 @@ export const createOrUpdateResources = async (
 
     const originalAnnotations = appResources?.editAppResource?.data?.metadata?.annotations || {};
     const triggerAnnotations = getTriggerAnnotation(
+      name,
       generatedImageStreamName || name,
       namespace,
       imageChange,

diff --git a/frontend/packages/dev-console/src/utils/__tests__/resource-label-utils.spec.tsx b/frontend/packages/dev-console/src/utils/__tests__/resource-label-utils.spec.tsx
@@ -1,4 +1,4 @@
-import { mergeData } from '../resource-label-utils';
+import { getTriggerAnnotation, mergeData } from '../resource-label-utils';
 import {
   devfileDeployment,
   newBuildConfig,
@@ -111,4 +111,18 @@ describe('resource-label-utils', () => {
       );
     });
   });
+  describe('getTriggerAnnotation', () => {
+    it('should return trigger annotation with proper values', () => {
+      let annotation = getTriggerAnnotation('test', 'python', 'div', true);
+      expect(annotation).toEqual({
+        'image.openshift.io/triggers':
+          '[{"from":{"kind":"ImageStreamTag","name":"python:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"test\\")].image","pause":"false"}]',
+      });
+      annotation = getTriggerAnnotation('test', 'test', 'div', false);
+      expect(annotation).toEqual({
+        'image.openshift.io/triggers':
+          '[{"from":{"kind":"ImageStreamTag","name":"test:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"test\\")].image","pause":"true"}]',
+      });
+    });
+  });
 });
diff --git a/frontend/packages/dev-console/src/utils/resource-label-utils.ts b/frontend/packages/dev-console/src/utils/resource-label-utils.ts
@@ -57,15 +57,16 @@ export const getCommonAnnotations = () => {
 };
 
 export const getTriggerAnnotation = (
-  name: string,
-  namespace: string,
+  containerName: string,
+  imageName: string,
+  imageNamespace: string,
   imageTrigger: boolean,
-  tag: string = 'latest',
+  imageTag: string = 'latest',
 ) => ({
   [TRIGGERS_ANNOTATION]: JSON.stringify([
     {
-      from: { kind: 'ImageStreamTag', name: `${name}:${tag}`, namespace },
-      fieldPath: `spec.template.spec.containers[?(@.name=="${name}")].image`,
+      from: { kind: 'ImageStreamTag', name: `${imageName}:${imageTag}`, namespace: imageNamespace },
+      fieldPath: `spec.template.spec.containers[?(@.name=="${containerName}")].image`,
       pause: `${!imageTrigger}`,
     },
   ]),

diff --git a/frontend/packages/knative-plugin/src/utils/create-knative-utils.ts b/frontend/packages/knative-plugin/src/utils/create-knative-utils.ts
@@ -93,6 +93,7 @@ export const getKnativeServiceDepResource = (
           ...(concurrencylimit && { containerConcurrency: concurrencylimit }),
           containers: [
             {
+              name,
               image: `${imageStreamUrl}`,
               ...(contTargetPort && {
                 ports: [