Unverified Commit 8efcbb11 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #74782 from andyzhangx/automated-cherry-pick-of-#74715-upstream-release-1.13

Automated cherry pick of #74715: add Azure Container Registry anonymous repo support
parents d3bbb4b2 d5e695b7
......@@ -206,6 +206,13 @@ func (a *acrProvider) Provide() credentialprovider.DockerConfig {
cfg[url] = *cred
}
}
// add ACR anonymous repo support: use empty username and password for anonymous access
cfg["*.azurecr.*"] = credentialprovider.DockerConfigEntry{
Username: "",
Password: "",
Email: dummyRegistryEmail,
}
return cfg
}
......
......@@ -76,14 +76,14 @@ func Test(t *testing.T) {
creds := provider.Provide()
if len(creds) != len(result) {
t.Errorf("Unexpected list: %v, expected length %d", creds, len(result))
if len(creds) != len(result)+1 {
t.Errorf("Unexpected list: %v, expected length %d", creds, len(result)+1)
}
for _, cred := range creds {
if cred.Username != "foo" {
if cred.Username != "" && cred.Username != "foo" {
t.Errorf("expected 'foo' for username, saw: %v", cred.Username)
}
if cred.Password != "bar" {
if cred.Password != "" && cred.Password != "bar" {
t.Errorf("expected 'bar' for password, saw: %v", cred.Username)
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment