diff --git a/modules/ztp-precaching-downloading-artifacts.adoc b/modules/ztp-precaching-downloading-artifacts.adoc index caa06dccd2..7f38e11f0b 100644 --- a/modules/ztp-precaching-downloading-artifacts.adoc +++ b/modules/ztp-precaching-downloading-artifacts.adoc @@ -112,11 +112,11 @@ The {factory-prestaging-tool} allows you to pre-cache all the container images r * Pre-cache the release by running the following command: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- # podman run -v /mnt:/mnt -v /root/.docker:/root/.docker --privileged --rm quay.io/openshift-kni/telco-ran-tools -- \ factory-precaching-cli download \ <1> - -r 4.12.0 \ <2> + -r {product-version}.0 \ <2> --acm-version 2.6.3 \ <3> --mce-version 2.1.4 \ <4> -f /mnt \ <5> @@ -131,7 +131,7 @@ The {factory-prestaging-tool} allows you to pre-cache all the container images r + .Example output -[source,terminal] +[source,terminal,subs="attributes+"] ---- Generated /mnt/imageset.yaml Generating list of pre-cached artifacts... @@ -147,7 +147,7 @@ Processing artifact [176/176]: ocp-v4.0-art-dev@sha256_cf4d862b4a4170d4f611b39d0 ... Summary: -Release: 4.12.0 +Release: {product-version}.0 Hub Version: 2.6.3 ACM Version: 2.6.3 MCE Version: 2.1.4 @@ -202,10 +202,10 @@ You need to include the {rh-rhacm} hub and MCE Operator versions by using the `- * Pre-cache the Operator images: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- # podman run -v /mnt:/mnt -v /root/.docker:/root/.docker --privileged --rm quay.io/openshift-kni/telco-ran-tools:latest -- factory-precaching-cli download \ <1> - -r 4.12.0 \ <2> + -r {product-version}.0 \ <2> --acm-version 2.6.3 \ <3> --mce-version 2.1.4 \ <4> -f /mnt \ <5> @@ -222,7 +222,7 @@ You need to include the {rh-rhacm} hub and MCE Operator versions by using the `- + .Example output -[source,terminal] +[source,terminal,subs="attributes+"] ---- Generated /mnt/imageset.yaml Generating list of pre-cached artifacts... @@ -235,7 +235,7 @@ Processing artifact [379/379]: multicluster-operators-channel-rhel8@sha256_c10f6 ... Summary: -Release: 4.12.0 +Release: {product-version}.0 Hub Version: 2.6.3 ACM Version: 2.6.3 MCE Version: 2.1.4 @@ -260,10 +260,10 @@ You can customize the `ImageSetConfiguration` CR in the following ways: . Pre-cache the images: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- # podman run -v /mnt:/mnt -v /root/.docker:/root/.docker --privileged --rm quay.io/openshift-kni/telco-ran-tools:latest -- factory-precaching-cli download \ <1> - -r 4.12.0 \ <2> + -r {product-version}.0 \ <2> --acm-version 2.6.3 \ <3> --mce-version 2.1.4 \ <4> -f /mnt \ <5> @@ -289,20 +289,20 @@ Generated /mnt/imageset.yaml + .Example ImageSetConfiguration CR -[source,yaml] +[source,yaml,subs="attributes+"] ---- apiVersion: mirror.openshift.io/v1alpha2 kind: ImageSetConfiguration mirror: platform: channels: - - name: stable-4.12 - minVersion: 4.12.0 <1> - maxVersion: 4.12.0 + - name: stable-{product-version} + minVersion: {product-version}.0 <1> + maxVersion: {product-version}.0 additionalImages: - name: quay.io/custom/repository operators: - - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12 + - catalog: registry.redhat.io/redhat/redhat-operator-index:v{product-version} packages: - name: advanced-cluster-management <2> channels: @@ -328,14 +328,14 @@ mirror: - name: 'stable' - name: lvms-operator <3> channels: - - name: 'stable-4.12' + - name: 'stable-{product-version}' - name: amq7-interconnect-operator <3> channels: - name: '1.10.x' - name: bare-metal-event-relay <3> channels: - name: 'stable' - - catalog: registry.redhat.io/redhat/certified-operator-index:v4.12 + - catalog: registry.redhat.io/redhat/certified-operator-index:v{product-version} packages: - name: sriov-fec <3> channels: @@ -347,7 +347,7 @@ mirror: . Customize the catalog resource in the CR: + -[source,yaml] +[source,yaml,subs="attributes+"] ---- apiVersion: mirror.openshift.io/v1alpha2 kind: ImageSetConfiguration @@ -355,7 +355,7 @@ mirror: platform: [...] operators: - - catalog: eko4.cloud.lab.eng.bos.redhat.com:8443/redhat/certified-operator-index:v4.12 + - catalog: eko4.cloud.lab.eng.bos.redhat.com:8443/redhat/certified-operator-index:v{product-version} packages: - name: sriov-fec channels: @@ -380,11 +380,11 @@ When you download images by using a local or disconnected registry, you have to . Mount the host `/etc/pki` folder into the factory-cli image: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- # podman run -v /mnt:/mnt -v /root/.docker:/root/.docker -v /etc/pki:/etc/pki --privileged --rm quay.io/openshift-kni/telco-ran-tools:latest -- \ factory-precaching-cli download \ <1> - -r 4.12.0 \ <2> + -r {product-version}.0 \ <2> --acm-version 2.6.3 \ <3> --mce-version 2.1.4 \ <4> -f /mnt \ <5> @@ -403,9 +403,9 @@ factory-precaching-cli download \ <1> . Download the images without generating a new `imageSetConfiguration` CR: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- -# podman run -v /mnt:/mnt -v /root/.docker:/root/.docker --privileged --rm quay.io/openshift-kni/telco-ran-tools:latest -- factory-precaching-cli download -r 4.12.0 \ +# podman run -v /mnt:/mnt -v /root/.docker:/root/.docker --privileged --rm quay.io/openshift-kni/telco-ran-tools:latest -- factory-precaching-cli download -r {product-version}.0 \ --acm-version 2.6.3 --mce-version 2.1.4 -f /mnt \ --img quay.io/custom/repository \ --du-profile -s \ diff --git a/modules/ztp-precaching-troubleshooting.adoc b/modules/ztp-precaching-troubleshooting.adoc index 663c36c05f..857c0af5e1 100644 --- a/modules/ztp-precaching-troubleshooting.adoc +++ b/modules/ztp-precaching-troubleshooting.adoc @@ -53,10 +53,10 @@ error: error rendering new refs: render reference "eko4.cloud.lab.eng.bos.redhat . Mount the host `/etc/pki` folder into the factory-cli image: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- # podman run -v /mnt:/mnt -v /root/.docker:/root/.docker -v /etc/pki:/etc/pki --privileged -it --rm quay.io/openshift-kni/telco-ran-tools:latest -- \ -factory-precaching-cli download -r 4.11.5 --acm-version 2.5.4 \ +factory-precaching-cli download -r {product-version}.0 --acm-version 2.5.4 \ --mce-version 2.0.4 -f /mnt \--img quay.io/custom/repository --du-profile -s --skip-imageset ---- \ No newline at end of file