Merge pull request #9 from KingEmet/master

remove b., bucket., and beta.gcr.io from list of supported repos

Author: Jake Sanders

cli/configure-docker_unit_test.go

@@ -34,11 +34,8 @@ func expectedAuthConfigs() map[string]types.AuthConfig {
 		"https://us.gcr.io":         {},
 		"https://eu.gcr.io":         {},
 		"https://asia.gcr.io":       {},
-		"https://b.gcr.io":          {},
-		"https://bucket.gcr.io":     {},
 		"https://appengine.gcr.io":  {},
 		"https://gcr.kubernetes.io": {},
-		"https://beta.gcr.io":       {},
 	}
 }
 

config/const.go

@@ -17,7 +17,6 @@ package config
 
 import (
 	"golang.org/x/oauth2"
-	//"golang.org/x/oauth2/google"
 )
 
 const (
@@ -52,11 +51,8 @@ var SupportedGCRRegistries = map[string]bool{
 	"us.gcr.io":         true,
 	"eu.gcr.io":         true,
 	"asia.gcr.io":       true,
-	"b.gcr.io":          true,
-	"bucket.gcr.io":     true,
 	"appengine.gcr.io":  true,
 	"gcr.kubernetes.io": true,
-	"beta.gcr.io":       true,
 }
 
 // SupportedGCRTokenSources maps config keys to plain english explanations for

credhelper/helper_integration_test.go

@@ -32,11 +32,8 @@ var expectedGcrHosts = [...]string{
 	"us.gcr.io",
 	"eu.gcr.io",
 	"asia.gcr.io",
-	"b.gcr.io",
-	"bucket.gcr.io",
 	"appengine.gcr.io",
 	"gcr.kubernetes.io",
-	"beta.gcr.io",
 }
 
 var testCredStorePath = filepath.Clean("helper_test_cred_store.json")

credhelper/helper_unit_test.go

@@ -40,11 +40,8 @@ var gcrHosts = [...]string{
 	"us.gcr.io",
 	"eu.gcr.io",
 	"asia.gcr.io",
-	"b.gcr.io",
-	"bucket.gcr.io",
 	"appengine.gcr.io",
 	"gcr.kubernetes.io",
-	"beta.gcr.io",
 }
 var otherHosts = [...]string{"docker.io", "otherrepo.com"}