From 98b30ec988960a65b1aec16110ac8c241bf3fcbe Mon Sep 17 00:00:00 2001 From: Jaivardhan Kumar Date: Fri, 28 Feb 2020 12:37:29 +0530 Subject: [PATCH] fixes issue with new imageStream getting created for knative in case of internal image registry --- .../components/import/deployImage-submit-utils.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 index 5fe97666400..e9e7aa26fba 100644 --- a/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts +++ b/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts @@ -325,7 +325,7 @@ export const createResources = async ( const { registry, route: { create: canCreateRoute }, - isi: { ports, tag: imageStreamTag }, + isi: { ports, tag: imageStreamTag, image }, } = formData; const requests: Promise[] = []; @@ -350,10 +350,12 @@ export const createResources = async ( } } else if (!dryRun) { // Do not run serverless call during the dry run. - const imageStreamResponse = await createImageStream(formData, dryRun); - const imageStreamUrl = imageStreamTag - ? `${imageStreamResponse.status.dockerImageRepository}:${imageStreamTag}` - : imageStreamResponse.status.dockerImageRepository; + let imageStreamUrl: string = image && image.dockerImageReference; + if (registry === RegistryType.External) { + const imageStreamResponse = await createImageStream(formData, dryRun); + const imageStreamRepo = imageStreamResponse.status.dockerImageRepository; + imageStreamUrl = imageStreamTag ? `${imageStreamRepo}:${imageStreamTag}` : imageStreamRepo; + } const knDeploymentResource = getKnativeServiceDepResource(formData, imageStreamUrl); requests.push(k8sCreate(KnServiceModel, knDeploymentResource)); }