From 5cd24d02a4c2d1851e0d83f866f6ea6ceb4cfd96 Mon Sep 17 00:00:00 2001 From: Vikram Raj Date: Thu, 21 Nov 2024 15:00:32 +0530 Subject: [PATCH] update the Deployment pod on change in imageStream --- .../src/components/deployments/utils/deployment-utils.ts | 2 +- .../components/edit-application/edit-application-utils.ts | 2 +- .../components/import/__tests__/import-submit-utils.spec.ts | 4 ++-- .../import/__tests__/upload-jar-submit-utils.spec.ts | 2 +- .../src/utils/__tests__/resource-label-utils-data.ts | 6 +++--- .../src/utils/__tests__/resource-label-utils.spec.tsx | 6 +++--- .../packages/dev-console/src/utils/resource-label-utils.ts | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/packages/dev-console/src/components/deployments/utils/deployment-utils.ts b/frontend/packages/dev-console/src/components/deployments/utils/deployment-utils.ts index 21f2028b5c67..c4236c139ad2 100644 --- a/frontend/packages/dev-console/src/components/deployments/utils/deployment-utils.ts +++ b/frontend/packages/dev-console/src/components/deployments/utils/deployment-utils.ts @@ -358,7 +358,7 @@ export const getTriggersAndImageStreamValues = ( return { ...data, triggers: { - image: imageTrigger?.paused === 'false', + image: imageTrigger?.paused === false, }, fromImageStreamTag: !!imageTrigger, imageStream: { diff --git a/frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts b/frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts index 4c6991b9b9ae..25166009877f 100644 --- a/frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts +++ b/frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts @@ -410,7 +410,7 @@ export const getDeploymentData = (resource: K8sResourceKind) => { return { env, triggers: { - image: imageTrigger?.paused === 'false', + image: imageTrigger?.paused === false, }, replicas: resource.spec?.replicas ?? 1, }; diff --git a/frontend/packages/dev-console/src/components/import/__tests__/import-submit-utils.spec.ts b/frontend/packages/dev-console/src/components/import/__tests__/import-submit-utils.spec.ts index 7f234e09397b..3efeaa666aa2 100644 --- a/frontend/packages/dev-console/src/components/import/__tests__/import-submit-utils.spec.ts +++ b/frontend/packages/dev-console/src/components/import/__tests__/import-submit-utils.spec.ts @@ -58,7 +58,7 @@ describe('Import Submit Utils', () => { namespace: 'gijohn', }, fieldPath: 'spec.template.spec.containers[?(@.name=="nodejs-ex-git")].image', - paused: 'false', + paused: false, }, ]); done(); @@ -431,7 +431,7 @@ describe('Import Submit Utils', () => { 'app.openshift.io/vcs-ref': 'master', 'app.openshift.io/vcs-uri': 'https://github.com/redhat-developer/devfile-sample', 'image.openshift.io/triggers': - '[{"from":{"kind":"ImageStreamTag","name":"devfile-sample:latest","namespace":"gijohn"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"devfile-sample\\")].image","paused":"false"}]', + '[{"from":{"kind":"ImageStreamTag","name":"devfile-sample:latest","namespace":"gijohn"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"devfile-sample\\")].image","paused":false}]', isFromDevfile: 'true', 'openshift.io/generated-by': 'OpenShiftWebConsole', 'app.openshift.io/route-disabled': 'false', diff --git a/frontend/packages/dev-console/src/components/import/__tests__/upload-jar-submit-utils.spec.ts b/frontend/packages/dev-console/src/components/import/__tests__/upload-jar-submit-utils.spec.ts index a5a1a3b294e7..43d2ab33afce 100644 --- a/frontend/packages/dev-console/src/components/import/__tests__/upload-jar-submit-utils.spec.ts +++ b/frontend/packages/dev-console/src/components/import/__tests__/upload-jar-submit-utils.spec.ts @@ -44,7 +44,7 @@ describe('Upload Jar Submit Utils', () => { namespace: 'my-app', }, fieldPath: 'spec.template.spec.containers[?(@.name=="java-ex-git")].image', - paused: 'false', + paused: false, }, ]); done(); diff --git a/frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts b/frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts index ef1cbcd12650..74e742065284 100644 --- a/frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts +++ b/frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts @@ -7,7 +7,7 @@ export const originalDeployment = { 'app.openshift.io/vcs-ref': 'master', 'app.openshift.io/vcs-uri': 'https://github.com/divyanshiGupta/nationalparks-py', 'image.openshift.io/triggers': - '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":"false"}]', + '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":false}]', 'openshift.io/generated-by': 'OpenShiftWebConsole', 'app.openshift.io/connects-to': 'database', 'deployment.kubernetes.io/revision': '4', @@ -104,7 +104,7 @@ export const newDeployment = { 'app.openshift.io/vcs-ref': 'master', 'app.openshift.io/vcs-uri': 'https://github.com/divyanshiGupta/nationalparks-py', 'image.openshift.io/triggers': - '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":"true"}]', + '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":true}]', 'openshift.io/generated-by': 'OpenShiftWebConsole', }, name: 'nationalparks-py', @@ -169,7 +169,7 @@ export const devfileDeployment = { 'app.openshift.io/vcs-ref': 'master', 'app.openshift.io/vcs-uri': 'https://github.com/divyanshiGupta/nationalparks-py', 'image.openshift.io/triggers': - '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":"true"}]', + '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":true}]', 'openshift.io/generated-by': 'OpenShiftWebConsole', isFromDevfile: 'true', }, 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 index 4fb8f5266b65..4a4cc27fdd1d 100644 --- 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 @@ -36,7 +36,7 @@ describe('resource-label-utils', () => { 'app.openshift.io/vcs-ref': 'master', 'app.openshift.io/vcs-uri': 'https://github.com/divyanshiGupta/nationalparks-py', 'image.openshift.io/triggers': - '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":"true"}]', + '[{"from":{"kind":"ImageStreamTag","name":"nationalparks-py:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"nationalparks-py\\")].image","paused":true}]', 'openshift.io/generated-by': 'OpenShiftWebConsole', 'app.openshift.io/connects-to': 'database', 'deployment.kubernetes.io/revision': '4', @@ -125,12 +125,12 @@ describe('resource-label-utils', () => { 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","paused":"false"}]', + '[{"from":{"kind":"ImageStreamTag","name":"python:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"test\\")].image","paused":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","paused":"true"}]', + '[{"from":{"kind":"ImageStreamTag","name":"test:latest","namespace":"div"},"fieldPath":"spec.template.spec.containers[?(@.name==\\"test\\")].image","paused":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 index 04b7416ad207..0f80c7a65d23 100644 --- a/frontend/packages/dev-console/src/utils/resource-label-utils.ts +++ b/frontend/packages/dev-console/src/utils/resource-label-utils.ts @@ -75,7 +75,7 @@ export const getTriggerAnnotation = ( { from: { kind: 'ImageStreamTag', name: `${imageName}:${imageTag}`, namespace: imageNamespace }, fieldPath: `spec.template.spec.containers[?(@.name=="${containerName}")].image`, - paused: `${!imageTrigger}`, + paused: !imageTrigger, }, ]), });