kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16117 from zetaab/skipfilerepository 

skip file remapping if same host
This commit is contained in:
Kubernetes Prow Robot 2023-11-26 22:05:13 +01:00 committed by GitHub
parent f73595fe05 9f383f93cc
commit 6977243608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/assets/builder.go
View File

@ -250,14 +250,15 @@ func (a *AssetBuilder) RemapFileAndSHA(fileURL *url.URL) (*url.URL, *hashing.Has
if a.AssetsLocation != nil && a.AssetsLocation.FileRepository != nil { if a.AssetsLocation != nil && a.AssetsLocation.FileRepository != nil {
normalizedFileURL, err := a.remapURL(fileURL) normalizedFile, err := a.remapURL(fileURL)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
fileAsset.DownloadURL = normalizedFileURL if fileURL.Host != normalizedFile.Host {
fileAsset.DownloadURL = normalizedFile
klog.V(4).Infof("adding remapped file: %+v", fileAsset) klog.V(4).Infof("adding remapped file: %q", fileAsset.DownloadURL.String())
}
} }
h, err := a.findHash(fileAsset) h, err := a.findHash(fileAsset)
@ -289,9 +290,10 @@ func (a *AssetBuilder) RemapFileAndSHAValue(fileURL *url.URL, shaValue string) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
if fileURL.Host != normalizedFile.Host {
fileAsset.DownloadURL = normalizedFile fileAsset.DownloadURL = normalizedFile
klog.V(4).Infof("adding remapped file: %q", fileAsset.DownloadURL.String()) klog.V(4).Infof("adding remapped file: %q", fileAsset.DownloadURL.String())
}
} }
klog.V(8).Infof("adding file: %+v", fileAsset) klog.V(8).Infof("adding file: %+v", fileAsset)