diff --git a/pkg/credentialprovider/azure/azure_credentials.go b/pkg/credentialprovider/azure/azure_credentials.go index a2759f525a5..199addf78aa 100644 --- a/pkg/credentialprovider/azure/azure_credentials.go +++ b/pkg/credentialprovider/azure/azure_credentials.go @@ -173,7 +173,7 @@ func (a *acrProvider) Enabled() bool { return true } -func (a *acrProvider) Provide() credentialprovider.DockerConfig { +func (a *acrProvider) Provide(image string) credentialprovider.DockerConfig { cfg := credentialprovider.DockerConfig{} ctx, cancel := getContextWithCancel() defer cancel() @@ -246,6 +246,6 @@ func getACRDockerEntryFromARMToken(a *acrProvider, loginServer string) (*credent }, nil } -func (a *acrProvider) LazyProvide() *credentialprovider.DockerConfigEntry { +func (a *acrProvider) LazyProvide(image string) *credentialprovider.DockerConfigEntry { return nil } diff --git a/pkg/credentialprovider/azure/azure_credentials_test.go b/pkg/credentialprovider/azure/azure_credentials_test.go index 6e5434ee285..3c106f796c4 100644 --- a/pkg/credentialprovider/azure/azure_credentials_test.go +++ b/pkg/credentialprovider/azure/azure_credentials_test.go @@ -74,7 +74,7 @@ func Test(t *testing.T) { } provider.loadConfig(bytes.NewBufferString(configStr)) - creds := provider.Provide() + creds := provider.Provide("") if len(creds) != len(result)+1 { t.Errorf("Unexpected list: %v, expected length %d", creds, len(result)+1) diff --git a/pkg/credentialprovider/gcp/metadata.go b/pkg/credentialprovider/gcp/metadata.go index 8fdc940c9fc..e484902ddde 100644 --- a/pkg/credentialprovider/gcp/metadata.go +++ b/pkg/credentialprovider/gcp/metadata.go @@ -130,12 +130,12 @@ func (g *metadataProvider) Enabled() bool { } // LazyProvide implements DockerConfigProvider. Should never be called. -func (g *dockerConfigKeyProvider) LazyProvide() *credentialprovider.DockerConfigEntry { +func (g *dockerConfigKeyProvider) LazyProvide(image string) *credentialprovider.DockerConfigEntry { return nil } // Provide implements DockerConfigProvider -func (g *dockerConfigKeyProvider) Provide() credentialprovider.DockerConfig { +func (g *dockerConfigKeyProvider) Provide(image string) credentialprovider.DockerConfig { // Read the contents of the google-dockercfg metadata key and // parse them as an alternate .dockercfg if cfg, err := credentialprovider.ReadDockerConfigFileFromUrl(dockerConfigKey, g.Client, metadataHeader); err != nil { @@ -148,12 +148,12 @@ func (g *dockerConfigKeyProvider) Provide() credentialprovider.DockerConfig { } // LazyProvide implements DockerConfigProvider. Should never be called. -func (g *dockerConfigUrlKeyProvider) LazyProvide() *credentialprovider.DockerConfigEntry { +func (g *dockerConfigUrlKeyProvider) LazyProvide(image string) *credentialprovider.DockerConfigEntry { return nil } // Provide implements DockerConfigProvider -func (g *dockerConfigUrlKeyProvider) Provide() credentialprovider.DockerConfig { +func (g *dockerConfigUrlKeyProvider) Provide(image string) credentialprovider.DockerConfig { // Read the contents of the google-dockercfg-url key and load a .dockercfg from there if url, err := credentialprovider.ReadUrl(dockerConfigUrlKey, g.Client, metadataHeader); err != nil { klog.Errorf("while reading 'google-dockercfg-url' metadata: %v", err) @@ -258,12 +258,12 @@ type tokenBlob struct { } // LazyProvide implements DockerConfigProvider. Should never be called. -func (g *containerRegistryProvider) LazyProvide() *credentialprovider.DockerConfigEntry { +func (g *containerRegistryProvider) LazyProvide(image string) *credentialprovider.DockerConfigEntry { return nil } // Provide implements DockerConfigProvider -func (g *containerRegistryProvider) Provide() credentialprovider.DockerConfig { +func (g *containerRegistryProvider) Provide(image string) credentialprovider.DockerConfig { cfg := credentialprovider.DockerConfig{} tokenJsonBlob, err := credentialprovider.ReadUrl(metadataToken, g.Client, metadataHeader) diff --git a/pkg/credentialprovider/gcp/metadata_test.go b/pkg/credentialprovider/gcp/metadata_test.go index 6a31c562c50..439d56c6375 100644 --- a/pkg/credentialprovider/gcp/metadata_test.go +++ b/pkg/credentialprovider/gcp/metadata_test.go @@ -91,7 +91,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) { t.Errorf("Provider is unexpectedly disabled") } - keyring.Add(provider.Provide()) + keyring.Add(provider.Provide("")) creds, ok := keyring.Lookup(registryUrl) if !ok { @@ -169,7 +169,7 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) { t.Errorf("Provider is unexpectedly disabled") } - keyring.Add(provider.Provide()) + keyring.Add(provider.Provide("")) creds, ok := keyring.Lookup(registryUrl) if !ok { @@ -253,7 +253,7 @@ func TestContainerRegistryBasics(t *testing.T) { t.Errorf("Provider is unexpectedly disabled") } - keyring.Add(provider.Provide()) + keyring.Add(provider.Provide("")) creds, ok := keyring.Lookup(registryUrl) if !ok { diff --git a/pkg/credentialprovider/rancher/rancher_registry_credentials.go b/pkg/credentialprovider/rancher/rancher_registry_credentials.go index d122308ed82..5725d9263c7 100644 --- a/pkg/credentialprovider/rancher/rancher_registry_credentials.go +++ b/pkg/credentialprovider/rancher/rancher_registry_credentials.go @@ -79,12 +79,12 @@ func (p *rancherProvider) Enabled() bool { } // LazyProvide implements DockerConfigProvider. Should never be called. -func (p *rancherProvider) LazyProvide() *credentialprovider.DockerConfigEntry { +func (p *rancherProvider) LazyProvide(image string) *credentialprovider.DockerConfigEntry { return nil } // Provide implements DockerConfigProvider.Provide, refreshing Rancher tokens on demand -func (p *rancherProvider) Provide() credentialprovider.DockerConfig { +func (p *rancherProvider) Provide(image string) credentialprovider.DockerConfig { cfg := credentialprovider.DockerConfig{} for _, cred := range p.credGetter.getCredentials() { entry := credentialprovider.DockerConfigEntry{ diff --git a/pkg/credentialprovider/rancher/rancher_registry_credentials_test.go b/pkg/credentialprovider/rancher/rancher_registry_credentials_test.go index 41e56b8076a..64037df4bc1 100644 --- a/pkg/credentialprovider/rancher/rancher_registry_credentials_test.go +++ b/pkg/credentialprovider/rancher/rancher_registry_credentials_test.go @@ -82,7 +82,7 @@ func TestRancherCredentialsProvide(t *testing.T) { } keyring := &credentialprovider.BasicDockerKeyring{} - keyring.Add(provider.Provide()) + keyring.Add(provider.Provide("")) for _, registry := range serverAddresses { fullImagePath := path.Join(registry, image)