mirror of
https://github.com/GoogleContainerTools/kaniko
synced 2026-10-21 12:04:11 +02:00
Jason Hall
f067edae9f
Prior to this change, Kaniko disabled logging for its ecr-login dependency by redirecting the logger's output to ioutil.Discard. However, since that used the logrus standard logger, this had the effect of completely disabling (redirecting to Discard) _all_ logging done by Kaniko. This caused integratiion test failures, and left any user of Kaniko without any logging. This fix updates the dependency on ecr-login to include a fix for this issue, and updates to the new API introduced in that fix.
37 lines
1.1 KiB
Go
37 lines
1.1 KiB
Go
/*
|
|
Copyright 2022 Google LLC
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package creds
|
|
|
|
import (
|
|
"io/ioutil"
|
|
|
|
ecr "github.com/awslabs/amazon-ecr-credential-helper/ecr-login"
|
|
"github.com/chrismellard/docker-credential-acr-env/pkg/credhelper"
|
|
"github.com/google/go-containerregistry/pkg/authn"
|
|
"github.com/google/go-containerregistry/pkg/v1/google"
|
|
)
|
|
|
|
// GetKeychain returns a keychain for accessing container registries.
|
|
func GetKeychain() authn.Keychain {
|
|
return authn.NewMultiKeychain(
|
|
authn.DefaultKeychain,
|
|
google.Keychain,
|
|
authn.NewKeychainFromHelper(ecr.NewECRHelper(ecr.WithLogger(ioutil.Discard))),
|
|
authn.NewKeychainFromHelper(credhelper.NewACRCredentialsHelper()),
|
|
)
|
|
}
|