Skip to content

Bug 1835995: avoid listing file system content for unsupported architures #272

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
May 15, 2020
Merged

Bug 1835995: avoid listing file system content for unsupported architures #272

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
6 changes: 6 additions & 0 deletions pkg/stub/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ func (h *Handler) buildFileMaps(cfg *v1.Config, forceRebuild bool) error {
defer h.mapsMutex.Unlock()
if len(h.imagestreamFile) == 0 || len(h.templateFile) == 0 || forceRebuild {
for _, arch := range cfg.Spec.Architectures {
if util.IsNonX86Arch(cfg) {
// file list error will occur below until we have samples for s390x/ppc64le
// callers to code appropriately no-op out as needed when no file system content
// exists for a given template/imagestream
continue
}
dir := h.GetBaseDir(arch, cfg)
files, err := h.Filefinder.List(dir)
if err != nil {
Expand Down