diff --git a/Makefile b/Makefile index 8986ff237d7..a481094ba6b 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ CHECK_CLUSTER_VERSION := $(or ${CHECK_CLUSTER_VERSION},False) ENABLE_SINGLE_NODE_DNSMASQ := $(or ${ENABLE_SINGLE_NODE_DNSMASQ},True) DISK_ENCRYPTION_SUPPORT := $(or ${DISK_ENCRYPTION_SUPPORT},True) DELETE_PVC := $(or ${DELETE_PVC},False) -TESTING_PUBLIC_CONTAINER_REGISTRIES := quay.io +TESTING_PUBLIC_CONTAINER_REGISTRIES := quay.io,registry.ci.openshift.org PUBLIC_CONTAINER_REGISTRIES := $(or ${PUBLIC_CONTAINER_REGISTRIES},$(TESTING_PUBLIC_CONTAINER_REGISTRIES)) PODMAN_PULL_FLAG := $(or ${PODMAN_PULL_FLAG},--pull always) ENABLE_KUBE_API := $(or ${ENABLE_KUBE_API},false) diff --git a/deploy/operator/setup_assisted_operator.sh b/deploy/operator/setup_assisted_operator.sh index e0072724fd2..168f9f66d00 100755 --- a/deploy/operator/setup_assisted_operator.sh +++ b/deploy/operator/setup_assisted_operator.sh @@ -80,7 +80,7 @@ EOF if [ -n "${PUBLIC_CONTAINER_REGISTRIES:-}" ]; then cat </ocp4/openshift4:4.10.22-x86_64","version":"4.10.22","default":true}]' SERVICE_BASE_URL: http://:8090 STORAGE: filesystem diff --git a/deploy/podman/configmap_tls.yml b/deploy/podman/configmap_tls.yml index 291d86274b0..a20fff7e2c4 100644 --- a/deploy/podman/configmap_tls.yml +++ b/deploy/podman/configmap_tls.yml @@ -30,7 +30,7 @@ data: POSTGRESQL_DATABASE: installer POSTGRESQL_PASSWORD: admin POSTGRESQL_USER: admin - PUBLIC_CONTAINER_REGISTRIES: 'quay.io' + PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org' RELEASE_IMAGES: '[{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.28-x86_64","version":"4.10.28"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.28-aarch64","version":"4.10.28"},{"openshift_version":"4.11","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0","default":true}]' SERVICE_BASE_URL: https://127.0.0.1:8090 STORAGE: filesystem