Merge pull request #18597 from bparees/centos_registry

openshift-merge-robot · web-flow · commit a658a12b5654 · 2018-02-14T09:29:21.000-08:00
Automatic merge from submit-queue.

add registry.centos.org to default whitelist
diff --git a/pkg/cmd/server/apis/config/types.go b/pkg/cmd/server/apis/config/types.go
@@ -157,6 +157,8 @@ var (
 		{DomainName: "*.redhat.com"}, // registry.connect.redhat.com and registry.access.redhat.com
 		{DomainName: "gcr.io"},
 		{DomainName: "quay.io"},
+		{DomainName: "registry.centos.org"},
+		{DomainName: "registry.redhat.io"},
 		// FIXME: Probably need to have more fine-tuned pattern defined
 		{DomainName: "*.amazonaws.com"},
 	}

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,8 @@ var (`
`157`	`157`	`{DomainName: "*.redhat.com"}, // registry.connect.redhat.com and registry.access.redhat.com`
`158`	`158`	`{DomainName: "gcr.io"},`
`159`	`159`	`{DomainName: "quay.io"},`
	`160`	`+ {DomainName: "registry.centos.org"},`
	`161`	`+ {DomainName: "registry.redhat.io"},`
`160`	`162`	`// FIXME: Probably need to have more fine-tuned pattern defined`
`161`	`163`	`{DomainName: "*.amazonaws.com"},`
`162`	`164`	`}`