Skip to content

[release-4.3] Bug 1808282: fixes issue with new imageStream getting created for knative in case of internal image registry #4546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 6, 2020
Merged

[release-4.3] Bug 1808282: fixes issue with new imageStream getting created for knative in case of internal image registry #4546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<K8sResourceKind>[] = [];
Expand All @@ -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));
}
Expand Down