Mention the new sha256 hash files only after failing all mirrors

This commit is contained in:
Ciprian Hacman 2020-09-18 09:51:55 +03:00
parent 0c6f1c733c
commit 2f218125fe
1 changed files with 4 additions and 5 deletions

View File

@ -318,11 +318,7 @@ func (a *AssetBuilder) findHash(file *FileAsset) (*hashing.Hash, error) {
b, err := vfs.Context.ReadFile(hashURL, vfs.WithBackoff(backoff)) b, err := vfs.Context.ReadFile(hashURL, vfs.WithBackoff(backoff))
if err != nil { if err != nil {
// Try to log without being too alarming - issue #7550 // Try to log without being too alarming - issue #7550
if ext == ".sha256" { klog.V(2).Infof("Unable to read hash file %q: %v", hashURL, err)
klog.V(2).Infof("Unable to read new sha256 hash file (is this an older/unsupported kubernetes release?) %q: %v", hashURL, err)
} else {
klog.V(2).Infof("Unable to read hash file %q: %v", hashURL, err)
}
continue continue
} }
hashString := strings.TrimSpace(string(b)) hashString := strings.TrimSpace(string(b))
@ -336,6 +332,9 @@ func (a *AssetBuilder) findHash(file *FileAsset) (*hashing.Hash, error) {
} }
return hashing.FromString(fields[0]) return hashing.FromString(fields[0])
} }
if ext == ".sha256" {
klog.V(2).Infof("Unable to read new sha256 hash file (is this an older/unsupported kubernetes release?)")
}
} }
} }