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

Merge remote-tracking branch 'upstream/master' into opts 

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
This commit is contained in:
Carlos Alexandro Becker 2020-06-24 15:10:05 -03:00
parent 57c2df4d97 cdbd8af057
commit f744acfbb7
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -613,7 +613,7 @@ Set this flag as `--log-format=<text|color|json>` to set the log format. Default
#### --log-timestamp #### --log-timestamp
Set this flag as `--log-format=<true|false>` to add timestamps to `<text|color>` log format. Defaults to `false`. Set this flag as `--log-timestamp=<true|false>` to add timestamps to `<text|color>` log format. Defaults to `false`.
#### --whitelist-var-run #### --whitelist-var-run

9
pkg/executor/push.go
View File

@ -105,19 +105,20 @@ func CheckPushPermissions(opts *config.KanikoOptions) error {
continue continue
} }
registryName := destRef.Repository.Registry.Name()
// Historically kaniko was pre-configured by default with gcr credential helper, // Historically kaniko was pre-configured by default with gcr credential helper,
// in here we keep the backwards compatibility by enabling the GCR helper only // in here we keep the backwards compatibility by enabling the GCR helper only
// when gcr.io is in one of the destinations. // when gcr.io (or pkg.dev) is in one of the destinations.
if strings.Contains(destRef.RegistryStr(), "gcr.io") { if registryName == "gcr.io" || strings.HasSuffix(registryName, ".gcr.io") || strings.HasSuffix(registryName, ".pkg.dev") {
// Checking for existence of docker.config as it's normally required for // Checking for existence of docker.config as it's normally required for
// authenticated registries and prevent overwriting user provided docker conf // authenticated registries and prevent overwriting user provided docker conf
if _, err := fs.Stat(DockerConfLocation()); os.IsNotExist(err) { if _, err := fs.Stat(DockerConfLocation()); os.IsNotExist(err) {
if err := execCommand("docker-credential-gcr", "configure-docker").Run(); err != nil { flags := fmt.Sprintf("--registries=%s", registryName)
if err := execCommand("docker-credential-gcr", "configure-docker", flags).Run(); err != nil {
return errors.Wrap(err, "error while configuring docker-credential-gcr helper") return errors.Wrap(err, "error while configuring docker-credential-gcr helper")
} }
} }
} }
registryName := destRef.Repository.Registry.Name()
if opts.Insecure || opts.InsecureRegistries.Contains(registryName) { if opts.Insecure || 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 {

4
pkg/executor/push_test.go
View File

@ -299,8 +299,12 @@ func TestCheckPushPermissions(t *testing.T) {
}{ }{
{"gcr.io/test-image", true, false}, {"gcr.io/test-image", true, false},
{"gcr.io/test-image", false, true}, {"gcr.io/test-image", false, true},
{"us-docker.pkg.dev/test-image", true, false},
{"us-docker.pkg.dev/test-image", false, true},
{"localhost:5000/test-image", false, false}, {"localhost:5000/test-image", false, false},
{"localhost:5000/test-image", false, true}, {"localhost:5000/test-image", false, true},
{"notgcr.io/test-image", false, false},
{"notgcr.io/test-image", false, true},
} }
execCommand = fakeExecCommand execCommand = fakeExecCommand