Skip to content

Commit

Permalink
use imageDigestSources (#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
loganmc10 authored Jun 6, 2024
1 parent 1a4c67c commit 0f4b085
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion edge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edge/install-config-sno-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ platform:
pullSecret: '{"auths":{"<mirror_hostname>:8443":{"auth":"<base64 encoded auth>"}}}'
sshKey: |
ssh-rsa ...
imageContentSources:
imageDigestSources:
- mirrors:
- <mirror_hostname>:8443/openshift/release
source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
Expand Down
2 changes: 1 addition & 1 deletion edge/install-config-standard-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ platform:
pullSecret: '{"auths":{"<mirror_hostname>:8443":{"auth":"<base64 encoded auth>"}}}'
sshKey: |
ssh-rsa ...
imageContentSources:
imageDigestSources:
- mirrors:
- <mirror_hostname>:8443/openshift/release
source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
Expand Down
6 changes: 3 additions & 3 deletions edge/roles/edge_install/tasks/install_config_overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0f4b085

Please sign in to comment.