Merge pull request kubernetes#74784 from andyzhangx/automated-cherry-pick-of-#74715-upstream-release-1.11

k8s-ci-robot · web-flow · commit 9c24e9972d7b · 2019-03-04T11:47:48.000-08:00
Automated cherry pick of kubernetes#74715: add Azure Container Registry anonymous repo support
diff --git a/pkg/credentialprovider/azure/azure_credentials.go b/pkg/credentialprovider/azure/azure_credentials.go
@@ -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
 }
 
diff --git a/pkg/credentialprovider/azure/azure_credentials_test.go b/pkg/credentialprovider/azure/azure_credentials_test.go
@@ -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)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,13 @@ func (a *acrProvider) Provide() credentialprovider.DockerConfig {`
`206`	`206`	`cfg[url] = *cred`
`207`	`207`	`}`
`208`	`208`	`}`
	`209`	`+`
	`210`	`+ // add ACR anonymous repo support: use empty username and password for anonymous access`
	`211`	`+ cfg[".azurecr."] = credentialprovider.DockerConfigEntry{`
	`212`	`+ Username: "",`
	`213`	`+ Password: "",`
	`214`	`+ Email: dummyRegistryEmail,`
	`215`	`+ }`
`209`	`216`	`return cfg`
`210`	`217`	`}`
`211`	`218`
Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,14 @@ func Test(t *testing.T) {`
`76`	`76`
`77`	`77`	`creds := provider.Provide()`
`78`	`78`
`79`		`- if len(creds) != len(result) {`
`80`		`- t.Errorf("Unexpected list: %v, expected length %d", creds, len(result))`
	`79`	`+ if len(creds) != len(result)+1 {`
	`80`	`+ t.Errorf("Unexpected list: %v, expected length %d", creds, len(result)+1)`
`81`	`81`	`}`
`82`	`82`	`for _, cred := range creds {`
`83`		`- if cred.Username != "foo" {`
	`83`	`+ if cred.Username != "" && cred.Username != "foo" {`
`84`	`84`	`t.Errorf("expected 'foo' for username, saw: %v", cred.Username)`
`85`	`85`	`}`
`86`		`- if cred.Password != "bar" {`
	`86`	`+ if cred.Password != "" && cred.Password != "bar" {`
`87`	`87`	`t.Errorf("expected 'bar' for password, saw: %v", cred.Username)`
`88`	`88`	`}`
`89`	`89`	`}`