Skip to content

When no argument passed to oc adm release new, dry run the output #22693

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 2 commits into from
Apr 29, 2019
Merged

When no argument passed to oc adm release new, dry run the output #22693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd0fb08
Improve error message when a release input is invalid
smarterclayton Apr 27, 2019
15292e0
When no argument passed to oc adm release new, dry run the output
smarterclayton Apr 28, 2019
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
4 changes: 2 additions & 2 deletions pkg/oc/cli/admin/release/image_mapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func NewTransformFromImageStreamFile(path string, input *imageapi.ImageStream, a
continue
}
if len(tag.From.Name) == 0 {
return nil, fmt.Errorf("Image file %q did not specify a valid target location for tag %q - no from.name for the tag", path, tag.Name)
return nil, fmt.Errorf("no from.name for the tag %s", tag.Name)
}
ref := ImageReference{SourceRepository: tag.From.Name}
for _, inputTag := range input.Spec.Tags {
Expand All @@ -145,7 +145,7 @@ func NewTransformFromImageStreamFile(path string, input *imageapi.ImageStream, a
klog.V(2).Infof("Image file %q referenced an image %q that is not part of the input images, skipping", path, tag.From.Name)
continue
}
return nil, fmt.Errorf("image file %q referenced image %q that is not part of the input images", path, tag.Name)
return nil, fmt.Errorf("no input image tag named %q", tag.Name)
}
references[tag.Name] = ref
}
Expand Down
Loading