diff --git a/bindata/v3.11.0/config/defaultconfig.yaml b/bindata/v3.11.0/config/defaultconfig.yaml index ce9f3fcf0..aeb6d799b 100644 --- a/bindata/v3.11.0/config/defaultconfig.yaml +++ b/bindata/v3.11.0/config/defaultconfig.yaml @@ -24,3 +24,10 @@ apiServerArguments: - "true" servingInfo: bindNetwork: "tcp" +imagePolicyConfig: + allowedRegistriesForImport: + - domainName: image-registry.openshift-image-registry.svc:5000 + - domainName: quay.io + - domainName: registry.redhat.io + - domainName: registry.access.redhat.com + - domainName: quay-proxy.ci.openshift.org diff --git a/pkg/operator/v311_00_assets/bindata.go b/pkg/operator/v311_00_assets/bindata.go index 3a1dc1c59..3c031e958 100644 --- a/pkg/operator/v311_00_assets/bindata.go +++ b/pkg/operator/v311_00_assets/bindata.go @@ -88,6 +88,13 @@ apiServerArguments: - "true" servingInfo: bindNetwork: "tcp" +imagePolicyConfig: + allowedRegistriesForImport: + - domainName: image-registry.openshift-image-registry.svc:5000 + - domainName: quay.io + - domainName: registry.redhat.io + - domainName: registry.access.redhat.com + - domainName: quay-proxy.ci.openshift.org `) func v3110ConfigDefaultconfigYamlBytes() ([]byte, error) { diff --git a/pkg/operator/workload/workload_openshiftapiserver_v311_00_sync_test.go b/pkg/operator/workload/workload_openshiftapiserver_v311_00_sync_test.go index a6c1138da..16a172eb8 100644 --- a/pkg/operator/workload/workload_openshiftapiserver_v311_00_sync_test.go +++ b/pkg/operator/workload/workload_openshiftapiserver_v311_00_sync_test.go @@ -399,6 +399,15 @@ func TestCapabilities(t *testing.T) { "shutdown-delay-duration": {"50s"}, "shutdown-send-retry-after": {"true"}, }, + ImagePolicyConfig: openshiftcontrolplanev1.ImagePolicyConfig{ + AllowedRegistriesForImport: openshiftcontrolplanev1.AllowedRegistries{ + {DomainName: "image-registry.openshift-image-registry.svc:5000"}, + {DomainName: "quay.io"}, + {DomainName: "registry.redhat.io"}, + {DomainName: "registry.access.redhat.com"}, + {DomainName: "quay-proxy.ci.openshift.org"}, + }, + }, APIServers: openshiftcontrolplanev1.APIServers{ PerGroupOptions: tc.expectedPerGroupOptions, },