Merge pull request #30930 from bergerhoffer/github-27053

GitHub-27053: Adjusting mirroring procedure for OKD

Author: bergerhoffer

modules/installation-mirror-repository.adoc

@@ -71,12 +71,20 @@ registry, such as `ocp4/openshift4`.
 
 .. Export the name of the repository to mirror:
 +
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 $ PRODUCT_REPO='openshift-release-dev'
 ----
 +
 For a production release, you must specify `openshift-release-dev`.
+endif::[]
+ifdef::openshift-origin[]
+[source,terminal]
+----
+$ PRODUCT_REPO='openshift'
+----
+endif::[]
 
 .. Export the path to your registry pull secret:
 +
@@ -89,19 +97,29 @@ For `<path_to_pull_secret>`, specify the absolute path to and file name of the p
 
 .. Export the release mirror:
 +
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 $ RELEASE_NAME="ocp-release"
 ----
 +
 For a production release, you must specify `ocp-release`.
+endif::[]
+ifdef::openshift-origin[]
+[source,terminal]
+----
+$ RELEASE_NAME="okd"
+----
+endif::[]
 
-.. Export the type of architecture for your server, such as `x86_64`.:
+ifndef::openshift-origin[]
+.. Export the type of architecture for your server, such as `x86_64`:
 +
 [source,terminal]
 ----
 $ ARCHITECTURE=<server_architecture>
 ----
+endif::[]
 
 .. Export the path to the directory to host the mirrored images:
 +
@@ -116,21 +134,42 @@ $ REMOVABLE_MEDIA_PATH=<path> <1>
 ... Connect the removable media to a system that is connected to the Internet.
 ... Review the images and configuration manifests to mirror:
 +
+ifdef::openshift-origin[]
+[source,terminal]
+----
+$ oc adm release mirror -a ${LOCAL_SECRET_JSON}  \
+     --from=quay.io/${PRODUCT_REPO}/${RELEASE_NAME}:${OCP_RELEASE} \
+     --to=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY} \
+     --to-release-image=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE} --dry-run
+----
+endif::[]
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 $ oc adm release mirror -a ${LOCAL_SECRET_JSON}  \
      --from=quay.io/${PRODUCT_REPO}/${RELEASE_NAME}:${OCP_RELEASE}-${ARCHITECTURE} \
      --to=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY} \
      --to-release-image=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE} --dry-run
 ----
+endif::[]
+
 ... Record the entire `imageContentSources` section from the output of the previous
 command. The information about your mirrors is unique to your mirrored repository, and you must add the `imageContentSources` section to the `install-config.yaml` file during installation.
 ... Mirror the images to a directory on the removable media:
 +
+ifdef::openshift-origin[]
+[source,terminal]
+----
+$ oc adm release mirror -a ${LOCAL_SECRET_JSON} --to-dir=${REMOVABLE_MEDIA_PATH}/mirror quay.io/${PRODUCT_REPO}/${RELEASE_NAME}:${OCP_RELEASE}
+----
+endif::[]
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 $ oc adm release mirror -a ${LOCAL_SECRET_JSON} --to-dir=${REMOVABLE_MEDIA_PATH}/mirror quay.io/${PRODUCT_REPO}/${RELEASE_NAME}:${OCP_RELEASE}-${ARCHITECTURE}
 ----
+endif::[]
+
 ... Take the media to the restricted network environment and upload the images to the local container registry.
 +
 [source,terminal]
@@ -143,13 +182,24 @@ $ oc image mirror -a ${LOCAL_SECRET_JSON} --from-dir=${REMOVABLE_MEDIA_PATH}/mir
 ** If the local container registry is connected to the mirror host, take the following actions:
 ... Directly push the release images to the local registry by using following command:
 +
+ifdef::openshift-origin[]
+[source,terminal]
+----
+$ oc adm release mirror -a ${LOCAL_SECRET_JSON}  \
+     --from=quay.io/${PRODUCT_REPO}/${RELEASE_NAME}:${OCP_RELEASE} \
+     --to=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY} \
+     --to-release-image=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}
+----
+endif::[]
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 $ oc adm release mirror -a ${LOCAL_SECRET_JSON}  \
      --from=quay.io/${PRODUCT_REPO}/${RELEASE_NAME}:${OCP_RELEASE}-${ARCHITECTURE} \
      --to=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY} \
      --to-release-image=${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE}
 ----
+endif::[]
 +
 This command pulls the release information as a digest, and its output includes
 the `imageContentSources` data that you require when you install your cluster.
@@ -172,10 +222,18 @@ $ oc adm release extract -a ${LOCAL_SECRET_JSON} --command=openshift-install "${
 ----
 ** If the local container registry is connected to the mirror host, run the following command:
 +
+ifdef::openshift-origin[]
+[source,terminal]
+----
+$ oc adm release extract -a ${LOCAL_SECRET_JSON} --command=openshift-install "${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}"
+----
+endif::[]
+ifndef::openshift-origin[]
 [source,terminal]
 ----
 $ oc adm release extract -a ${LOCAL_SECRET_JSON} --command=openshift-install "${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE}"
 ----
+endif::[]
 +
 [IMPORTANT]
 ====