From 403602f5790e0b6b708e130ab71c193e3b1edc5c Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:32:37 -0600 Subject: [PATCH] use imageDigestSources --- edge/README.md | 2 +- edge/install-config-sno-example.yaml | 2 +- edge/install-config-standard-example.yaml | 2 +- edge/roles/edge_install/tasks/install_config_overrides.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/edge/README.md b/edge/README.md index b22454a..134e4d6 100644 --- a/edge/README.md +++ b/edge/README.md @@ -41,7 +41,7 @@ The mirror registry should be populated using the [oc mirror](https://docs.opens If the provisioning cluster was configured to use a mirror registry, then the SSL certificate for the mirror registry will automatically be added to additionalTrustedCA on the edge cluster. -If you want to install Operators on the edge cluster from the disconnected registry, you'll need to add ImageContentSources for those operators in your install-config.yaml, as well as create a CatalogSource pointing to the mirror registry. +If you want to install Operators on the edge cluster from the disconnected registry, you'll need to add imageDigestSources for those operators in your install-config.yaml, as well as create a CatalogSource pointing to the mirror registry. See the ```install_manifests_mirror_example``` folder for an example of how you can use the ```installManifestsFolder``` option in the install-config to configure a CatalogSource during the installation process. # Automatic installation via virtual media diff --git a/edge/install-config-sno-example.yaml b/edge/install-config-sno-example.yaml index ecaf985..c432269 100644 --- a/edge/install-config-sno-example.yaml +++ b/edge/install-config-sno-example.yaml @@ -97,7 +97,7 @@ platform: pullSecret: '{"auths":{":8443":{"auth":""}}}' sshKey: | ssh-rsa ... -imageContentSources: +imageDigestSources: - mirrors: - :8443/openshift/release source: quay.io/openshift-release-dev/ocp-v4.0-art-dev diff --git a/edge/install-config-standard-example.yaml b/edge/install-config-standard-example.yaml index 03e77bb..1905cf3 100644 --- a/edge/install-config-standard-example.yaml +++ b/edge/install-config-standard-example.yaml @@ -166,7 +166,7 @@ platform: pullSecret: '{"auths":{":8443":{"auth":""}}}' sshKey: | ssh-rsa ... -imageContentSources: +imageDigestSources: - mirrors: - :8443/openshift/release source: quay.io/openshift-release-dev/ocp-v4.0-art-dev diff --git a/edge/roles/edge_install/tasks/install_config_overrides.yaml b/edge/roles/edge_install/tasks/install_config_overrides.yaml index 0eb348f..fb9fd59 100644 --- a/edge/roles/edge_install/tasks/install_config_overrides.yaml +++ b/edge/roles/edge_install/tasks/install_config_overrides.yaml @@ -8,10 +8,10 @@ ansible.builtin.set_fact: install_overrides: "{{ install_overrides | combine({'capabilities': capabilities}, recursive=true) }}" -- name: Add imageContentSources to config - when: imageContentSources is defined +- name: Add imageDigestSources to config + when: imageDigestSources is defined ansible.builtin.set_fact: - install_overrides: "{{ install_overrides | combine({'imageContentSources': imageContentSources}, recursive=true) }}" + install_overrides: "{{ install_overrides | combine({'imageDigestSources': imageDigestSources}, recursive=true) }}" - name: Add additionalTrustBundle to config when: additionalTrustBundle is defined