Skip to content
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

Jump to bottom

Bug 1822381: revert pr 177; no override jenkins* registry hosts for mirrors #260

Merged
merged 1 commit into from Apr 8, 2020
Merged

Bug 1822381: revert pr 177; no override jenkins* registry hosts for mirrors #260

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/stub/imagestreams.go
View file
Open in desktop
Expand Up @@ -267,6 +267,16 @@ func (h *Handler) upsertImageStream(imagestreamInOperatorImage, imagestreamInClu

func (h *Handler) updateDockerPullSpec(oldies []string, imagestream *imagev1.ImageStream, opcfg *v1.Config) {
logrus.Debugf("updateDockerPullSpec stream %s has repo %s", imagestream.Name, imagestream.Spec.DockerImageRepository)
// we always want to leave the jenkins images as using the payload set to the IMAGE* env's;
switch imagestream.Name {
case "jenkins":
return
case "jenkins-agent-nodejs":
return
case "jenkins-agent-maven":
return
}

// don't mess with deprecated field unless it is actually set with something
if len(imagestream.Spec.DockerImageRepository) > 0 &&
!strings.HasPrefix(imagestream.Spec.DockerImageRepository, opcfg.Spec.SamplesRegistry) {
Expand Down