public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #685 from tralexa/master 

insecure flag not honored in cache
This commit is contained in:
Don McCasland 2019-09-20 13:32:19 -07:00 committed by GitHub
parent e048b87222 62acf3ac1d
commit ccd99fbeec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cache/cache.go vendored
View File

@ -59,7 +59,7 @@ func (rc *RegistryCache) RetrieveLayer(ck string) (v1.Image, error) {
} }
registryName := cacheRef.Repository.Registry.Name() registryName := cacheRef.Repository.Registry.Name()
if rc.Opts.InsecureRegistries.Contains(registryName) { if rc.Opts.Insecure || rc.Opts.InsecureRegistries.Contains(registryName) {
newReg, err := name.NewRegistry(registryName, name.WeakValidation, name.Insecure) newReg, err := name.NewRegistry(registryName, name.WeakValidation, name.Insecure)
if err != nil { if err != nil {
return nil, err return nil, err

7
pkg/executor/push.go
View File

@ -77,6 +77,13 @@ func CheckPushPermissions(opts *config.KanikoOptions) error {
} }
registryName := destRef.Repository.Registry.Name() registryName := destRef.Repository.Registry.Name()
if opts.Insecure || opts.InsecureRegistries.Contains(registryName) {
newReg, err := name.NewRegistry(registryName, name.WeakValidation, name.Insecure)
if err != nil {
return errors.Wrap(err, "getting new insecure registry")
}
destRef.Repository.Registry = newReg
}
tr := makeTransport(opts, registryName) tr := makeTransport(opts, registryName)
if err := remote.CheckPushPermission(destRef, creds.GetKeychain(), tr); err != nil { if err := remote.CheckPushPermission(destRef, creds.GetKeychain(), tr); err != nil {
return errors.Wrapf(err, "checking push permission for %q", destRef) return errors.Wrapf(err, "checking push permission for %q", destRef)