From c54daee2a3683ba8517143b98934d57591adcfac Mon Sep 17 00:00:00 2001 From: danmanor Date: Sat, 28 Sep 2024 13:42:06 +0300 Subject: [PATCH] Revert "Fix OKD podman deploy (#6588)" This reverts commit 704d2af30ef09131e7f54dfb2f4b7854570ab9ec. --- data/default_public_container_registries.txt | 2 +- deploy/podman/README.md | 6 +----- deploy/podman/configmap.yml | 2 +- deploy/podman/okd-configmap.yml | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/data/default_public_container_registries.txt b/data/default_public_container_registries.txt index 84bf0e92602..a485438b731 100644 --- a/data/default_public_container_registries.txt +++ b/data/default_public_container_registries.txt @@ -1 +1 @@ -quay.io,registry.ci.openshift.org +quay.io diff --git a/deploy/podman/README.md b/deploy/podman/README.md index b37c1dcdc13..6643642aa25 100644 --- a/deploy/podman/README.md +++ b/deploy/podman/README.md @@ -66,7 +66,7 @@ the assisted-service API that agents will connect to. Additionally, make sure to change the following: ```yaml -ASSISTED_SERVICE_URL: https://127.0.0.1:8090 +ASSISTED_SERVICE_URL: https://127.0.0.1:8090 HTTPS_CERT_FILE: "/etc/certs/tls.crt" # Need to match certs-configmap-volume mountPath HTTPS_KEY_FILE: "/etc/certs/tls.key" # Need to match certs-configmap-volume mountPath HTTPS_CA_FILE: "/etc/certs/tls.crt" # Need to match certs-configmap-volume mountPath. Needed if the certificate is not signed by a CA in RHEL's default trust bundle. @@ -74,10 +74,6 @@ ASSISTED_SERVICE_HOST: 127.0.0.1:8090 ASSISTED_SERVICE_SCHEME: https # A must for the UI nginx to be configured with TLS ``` -If you are using a `RELEASE_IMAGE` hosted on a different registry than quay.io, add -the host name to the `PUBLIC_CONTAINER_REGISTRIES` environment variable. You have an -example in [okd-configmap.yml](./okd-configmap.yml). - ## Optional Configuration Other environment variables may be set in configmap.yml. For example, custom diff --git a/deploy/podman/configmap.yml b/deploy/podman/configmap.yml index 5420d6c4906..9cd9f0e3f4a 100644 --- a/deploy/podman/configmap.yml +++ b/deploy/podman/configmap.yml @@ -26,7 +26,7 @@ data: POSTGRESQL_DATABASE: installer POSTGRESQL_PASSWORD: admin POSTGRESQL_USER: admin - PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org' + PUBLIC_CONTAINER_REGISTRIES: 'quay.io' RELEASE_IMAGES: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64","version":"4.9.59"},{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.67-x86_64","version":"4.10.67"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.67-aarch64","version":"4.10.67"},{"openshift_version":"4.11","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.59-x86_64","version":"4.11.59"},{"openshift_version":"4.11","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.59-aarch64","version":"4.11.59"},{"openshift_version":"4.11.0-multi","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-multi"},{"openshift_version":"4.12","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-x86_64","version":"4.12.60"},{"openshift_version":"4.12","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-aarch64","version":"4.12.60"},{"openshift_version":"4.12-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.12.60-multi","version":"4.12.60-multi"},{"openshift_version":"4.13","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.45-x86_64","version":"4.13.45"},{"openshift_version":"4.13","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.45-aarch64","version":"4.13.45"},{"openshift_version":"4.13-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.13.45-multi","version":"4.13.45-multi"},{"openshift_version":"4.14","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.33-x86_64","version":"4.14.33"},{"openshift_version":"4.14","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.33-aarch64","version":"4.14.33"},{"openshift_version":"4.14-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.14.33-multi","version":"4.14.33-multi"},{"openshift_version":"4.15","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-x86_64","version":"4.15.21"},{"openshift_version":"4.15","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-aarch64","version":"4.15.21"},{"openshift_version":"4.15-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.15.21-multi","version":"4.15.21-multi"},{"openshift_version":"4.16","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.3-x86_64","version":"4.16.3","default":true},{"openshift_version":"4.16","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.3-aarch64","version":"4.16.3"},{"openshift_version":"4.16-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.16.3-multi","version":"4.16.3-multi"},{"openshift_version":"4.17","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-x86_64","support_level":"beta","version":"4.17.0-ec.1"},{"openshift_version":"4.17","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-aarch64","support_level":"beta","version":"4.17.0-ec.1"},{"openshift_version":"4.17-multi","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.17.0-ec.1-multi","support_level":"beta","version":"4.17.0-ec.1-multi"}]' SERVICE_BASE_URL: http://127.0.0.1:8090 STORAGE: filesystem diff --git a/deploy/podman/okd-configmap.yml b/deploy/podman/okd-configmap.yml index a359795976d..0433ed29eea 100644 --- a/deploy/podman/okd-configmap.yml +++ b/deploy/podman/okd-configmap.yml @@ -24,7 +24,7 @@ data: POSTGRESQL_DATABASE: installer POSTGRESQL_PASSWORD: admin POSTGRESQL_USER: admin - PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org' + PUBLIC_CONTAINER_REGISTRIES: 'quay.io' SERVICE_BASE_URL: http://127.0.0.1:8090 STORAGE: filesystem OS_IMAGES: '[{"openshift_version":"4.16","cpu_architecture":"x86_64","url":"https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20240322.3.1/x86_64/fedora-coreos-39.20240322.3.1-live.x86_64.iso","version":"39.20240322.3.1"}]'