From a3c22beecfa7328506fb59ee7097ee315d28a00a Mon Sep 17 00:00:00 2001 From: Samantha Gidlow Date: Wed, 2 Jun 2021 10:45:29 -0400 Subject: [PATCH] [enterprise-4.8] BZ1962111: Reorganize MTC --- _topic_map.yml | 40 +++------ ...onfiguring-replication-repository-3-4.adoc | 30 ------- .../installing-restricted-3-4.adoc | 2 - migrating_from_ocp_3_to_4/upgrading-3-4.adoc | 2 +- .../about-mtc.adoc | 19 +++++ migration-toolkit-for-containers/images | 1 + .../installing-mtc-restricted.adoc | 34 ++++++++ .../installing-mtc.adoc | 44 ++++++++++ .../migrating-applications-with-mtc.adoc | 27 +++--- migration-toolkit-for-containers/modules | 1 + .../troubleshooting-mtc.adoc | 11 +-- .../upgrading-mtc.adoc | 19 +++++ ...figuring-replication-repository-4-1-4.adoc | 33 -------- .../migrating_4_1_4/deploying-cam-4-1-4.adoc | 84 ------------------- migration/migrating_4_1_4/images | 1 - ...migrating-application-workloads-4-1-4.adoc | 28 ------- ...migrating-applications-with-cam-4-1-4.adoc | 78 ----------------- migration/migrating_4_1_4/modules | 1 - .../troubleshooting-4-1-4.adoc | 44 ---------- ...figuring-replication-repository-4-2-4.adoc | 33 -------- .../migrating_4_2_4/deploying-cam-4-2-4.adoc | 84 ------------------- migration/migrating_4_2_4/images | 1 - ...migrating-application-workloads-4-2-4.adoc | 28 ------- migration/migrating_4_2_4/modules | 1 - ...y-red-hat-openshift-container-storage.adoc | 2 +- modules/migration-about-migration-hooks.adoc | 3 +- modules/migration-adding-cluster-to-cam.adoc | 3 +- ...-adding-replication-repository-to-cam.adoc | 3 +- ...ration-changing-migration-plan-limits.adoc | 3 +- modules/migration-configuring-aws-s3.adoc | 4 +- modules/migration-configuring-azure.adoc | 4 +- modules/migration-configuring-gcp.adoc | 4 +- modules/migration-configuring-mcg.adoc | 4 +- .../migration-configuring-proxy-for-dvm.adoc | 3 +- modules/migration-creating-ca-bundle.adoc | 3 +- ...migration-creating-migration-plan-cam.adoc | 3 +- .../migration-debugging-velero-resources.adoc | 3 +- modules/migration-downloading-logs.adoc | 3 +- .../migration-dvm-error-node-selectors.adoc | 3 +- modules/migration-error-messages.adoc | 3 +- modules/migration-excluding-resources.adoc | 3 +- .../migration-installing-mtc-on-ocp-3.adoc | 4 +- .../migration-installing-mtc-on-ocp-4.adoc | 29 +++---- modules/migration-known-issues.adoc | 3 +- modules/migration-launching-cam.adoc | 3 +- .../migration-migrating-applications-api.adoc | 3 +- modules/migration-mtc-cr-manifests.adoc | 3 +- modules/migration-mtc-custom-resources.adoc | 3 +- modules/migration-mtc-workflow.adoc | 3 +- modules/migration-partial-failure-velero.adoc | 3 +- modules/migration-prerequisites.adoc | 3 +- .../migration-rolling-back-migration-cli.adoc | 3 +- ...on-rolling-back-migration-web-console.adoc | 3 +- .../migration-running-migration-plan-cam.adoc | 3 +- ...ation-understanding-data-copy-methods.adoc | 3 +- .../migration-updating-deprecated-gvks.adoc | 1 + ...n-updating-deprecated-internal-images.adoc | 1 + modules/migration-upgrading-from-mtc-1-3.adoc | 3 +- modules/migration-upgrading-mtc-on-ocp-3.adoc | 3 +- modules/migration-upgrading-mtc-on-ocp-4.adoc | 3 +- modules/migration-using-mig-log-reader.adoc | 3 +- modules/migration-using-must-gather.adoc | 3 +- modules/migration-viewing-migration-crs.adoc | 3 +- ...gration-writing-ansible-playbook-hook.adoc | 3 +- modules/olm-creating-catalog-from-index.adoc | 3 - modules/olm-mirroring-catalog.adoc | 3 - modules/olm-pruning-index-image.adoc | 3 - 67 files changed, 203 insertions(+), 598 deletions(-) delete mode 100644 migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc create mode 100644 migration-toolkit-for-containers/about-mtc.adoc create mode 120000 migration-toolkit-for-containers/images create mode 100644 migration-toolkit-for-containers/installing-mtc-restricted.adoc create mode 100644 migration-toolkit-for-containers/installing-mtc.adoc rename migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc => migration-toolkit-for-containers/migrating-applications-with-mtc.adoc (67%) create mode 120000 migration-toolkit-for-containers/modules rename migration/migrating_4_2_4/troubleshooting-4-2-4.adoc => migration-toolkit-for-containers/troubleshooting-mtc.adoc (79%) create mode 100644 migration-toolkit-for-containers/upgrading-mtc.adoc delete mode 100644 migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc delete mode 100644 migration/migrating_4_1_4/deploying-cam-4-1-4.adoc delete mode 120000 migration/migrating_4_1_4/images delete mode 100644 migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc delete mode 100644 migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc delete mode 120000 migration/migrating_4_1_4/modules delete mode 100644 migration/migrating_4_1_4/troubleshooting-4-1-4.adoc delete mode 100644 migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc delete mode 100644 migration/migrating_4_2_4/deploying-cam-4-2-4.adoc delete mode 120000 migration/migrating_4_2_4/images delete mode 100644 migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc delete mode 120000 migration/migrating_4_2_4/modules diff --git a/_topic_map.yml b/_topic_map.yml index 504c0c1cf2..29fdf4e314 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -1972,35 +1972,21 @@ Topics: File: troubleshooting-3-4 --- Name: Migration Toolkit for Containers -Dir: migration +Dir: migration-toolkit-for-containers Distros: openshift-enterprise,openshift-origin Topics: -- Name: Migrating from OpenShift Container Platform 4.1 - Dir: migrating_4_1_4 - Topics: - - Name: About the Migration Toolkit for Containers - File: migrating-application-workloads-4-1-4 - - Name: Installing and upgrading the Migration Toolkit for Containers - File: deploying-cam-4-1-4 - - Name: Configuring object storage for a replication repository - File: configuring-replication-repository-4-1-4 - - Name: Migrating your applications - File: migrating-applications-with-cam-4-1-4 - - Name: Troubleshooting - File: troubleshooting-4-1-4 -- Name: Migrating from OpenShift Container Platform 4.2 and later - Dir: migrating_4_2_4 - Topics: - - Name: About the Migration Toolkit for Containers - File: migrating-application-workloads-4-2-4 - - Name: Installing and upgrading the Migration Toolkit for Containers - File: deploying-cam-4-2-4 - - Name: Configuring object storage for a replication repository - File: configuring-replication-repository-4-2-4 - - Name: Migrating your applications - File: migrating-applications-with-cam-4-2-4 - - Name: Troubleshooting - File: troubleshooting-4-2-4 +- Name: About MTC + File: about-mtc +- Name: Installing MTC + File: installing-mtc +- Name: Installing MTC in a restricted network environment + File: installing-mtc-restricted +- Name: Upgrading MTC + File: upgrading-mtc +- Name: Migrating your applications + File: migrating-applications-with-mtc +- Name: Troubleshooting + File: troubleshooting-mtc --- Name: API reference Dir: rest_api diff --git a/migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc b/migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc deleted file mode 100644 index 2afee76967..0000000000 --- a/migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc +++ /dev/null @@ -1,30 +0,0 @@ -[id="configuring-replication-repository-3-4"] -= Configuring object storage for a replication repository -include::modules/common-attributes.adoc[] -:context: configuring-replication-repository-3-4 - -toc::[] - -You must configure an object storage to use as a replication repository. The {mtc-full} ({mtc-short}) copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster. - -{mtc-short} supports the xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-understanding-data-copy-methods_about-mtc-3-4[file system and snapshot data copy methods] for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. - -The following storage providers are supported: - -* xref:../migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc#migration-configuring-mcg_configuring-replication-repository-3-4[Multi-Cloud Object Gateway (MCG)] -* xref:../migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc#migration-configuring-aws-s3_configuring-replication-repository-3-4[Amazon Web Services (AWS) S3] -* xref:../migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc#migration-configuring-gcp_configuring-replication-repository-3-4[Google Cloud Provider (GCP)] -* xref:../migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc#migration-configuring-azure_configuring-replication-repository-3-4[Microsoft Azure] -* Generic S3 object storage, for example, Minio or Ceph S3 - -In a restricted environment, you can create an internally hosted replication repository. - -.Prerequisites - -* All clusters must have uninterrupted network access to the replication repository. -* If you use a proxy server with an internally hosted replication repository, you must ensure that the proxy allows access to the replication repository. - -include::modules/migration-configuring-mcg.adoc[leveloffset=+1] -include::modules/migration-configuring-aws-s3.adoc[leveloffset=+1] -include::modules/migration-configuring-gcp.adoc[leveloffset=+1] -include::modules/migration-configuring-azure.adoc[leveloffset=+1] diff --git a/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc b/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc index 86a0984b3a..499bf7e568 100644 --- a/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc +++ b/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc @@ -17,8 +17,6 @@ By default, the {mtc-short} web console and the `Migration Controller` pod run o You can configure the `Migration Controller` custom resource manifest to run the {mtc-short} web console and the `Migration Controller` pod on a link:https://access.redhat.com/articles/5064151[source cluster or on a remote cluster]. -You must create an Operator catalog from a mirror image in a local registry. See xref:../operators/admin/olm-restricted-networks.adoc[Using Operator Lifecycle Manager on restricted networks] for instructions. - include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+1] include::modules/migration-installing-mtc-on-ocp-3.adoc[leveloffset=+1] diff --git a/migrating_from_ocp_3_to_4/upgrading-3-4.adoc b/migrating_from_ocp_3_to_4/upgrading-3-4.adoc index b2f2d939c4..565f95ac7e 100644 --- a/migrating_from_ocp_3_to_4/upgrading-3-4.adoc +++ b/migrating_from_ocp_3_to_4/upgrading-3-4.adoc @@ -11,7 +11,7 @@ You can upgrade the {mtc-full} ({mtc-short}) by using the {product-title} web co ==== You must ensure that you upgrade to the same {mtc-short} version on all clusters. -If you are upgrading {mtc-short} version 1.3, you must perform an additional procedure to update the `MigPlan` custom resource (CR). +If you are upgrading from {mtc-short} version 1.3, you must perform an additional procedure to update the `MigPlan` custom resource (CR). ==== include::modules/migration-upgrading-mtc-on-ocp-4.adoc[leveloffset=+1] diff --git a/migration-toolkit-for-containers/about-mtc.adoc b/migration-toolkit-for-containers/about-mtc.adoc new file mode 100644 index 0000000000..32c173af56 --- /dev/null +++ b/migration-toolkit-for-containers/about-mtc.adoc @@ -0,0 +1,19 @@ +[id="about-mtc"] += About the {mtc-full} +include::modules/common-attributes.adoc[] +:context: about-mtc + +toc::[] + +The {mtc-full} ({mtc-short}) web console and API, based on Kubernetes custom resources, enable you to migrate stateful application workloads at the granularity of a namespace. + +The {mtc-short} console is installed on the target cluster by default. You can configure the {mtc-full} Operator to install the console on a link:https://access.redhat.com/articles/5064151[remote cluster]. + +{mtc-short} supports the file system and snapshot data copy methods for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. + +You can use migration hooks to run Ansible playbooks at certain points during the migration. The hooks are added when you create a migration plan. + +include::modules/migration-mtc-workflow.adoc[leveloffset=+1] +include::modules/migration-mtc-custom-resources.adoc[leveloffset=+1] +include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1] +include::modules/migration-about-migration-hooks.adoc[leveloffset=+1] diff --git a/migration-toolkit-for-containers/images b/migration-toolkit-for-containers/images new file mode 120000 index 0000000000..5e67573196 --- /dev/null +++ b/migration-toolkit-for-containers/images @@ -0,0 +1 @@ +../images \ No newline at end of file diff --git a/migration-toolkit-for-containers/installing-mtc-restricted.adoc b/migration-toolkit-for-containers/installing-mtc-restricted.adoc new file mode 100644 index 0000000000..af1ad48b01 --- /dev/null +++ b/migration-toolkit-for-containers/installing-mtc-restricted.adoc @@ -0,0 +1,34 @@ +[id="installing-mtc-restricted"] += Installing the Migration Toolkit for Containers in a restricted network environment +include::modules/common-attributes.adoc[] +:context: installing-mtc-restricted +:installing-mtc-restricted: + +toc::[] + +You can install the {mtc-full} ({mtc-short}) on {product-title} 4 in a restricted network environment. + +[IMPORTANT] +==== +You must install the same {mtc-short} version on all clusters. +==== + +By default, the {mtc-short} web console and the `Migration Controller` pod run on the target cluster. + +You can configure the `Migration Controller` custom resource manifest to run the {mtc-short} web console and the `Migration Controller` pod on a link:https://access.redhat.com/articles/5064151[remote cluster]. + +include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+1] + +[id="configuring-replication-repository_{context}"] +== Configuring a replication repository + +You must configure an object storage to use as a replication repository. The {mtc-full} ({mtc-short}) copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster. Multi-Cloud Object Gateway (MCG) is the only supported option for a restricted network environment. + +{mtc-short} supports the xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-understanding-data-copy-methods_about-mtc[file system and snapshot data copy methods] for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. + +All clusters must have uninterrupted network access to the replication repository. + +If you use a proxy server with an internally hosted replication repository, you must ensure that the proxy allows access to the replication repository. + +include::modules/migration-configuring-mcg.adoc[leveloffset=+2] +:installing-mtc-restricted!: diff --git a/migration-toolkit-for-containers/installing-mtc.adoc b/migration-toolkit-for-containers/installing-mtc.adoc new file mode 100644 index 0000000000..73cff08194 --- /dev/null +++ b/migration-toolkit-for-containers/installing-mtc.adoc @@ -0,0 +1,44 @@ +[id="installing-mtc"] += Installing the Migration Toolkit for Containers +include::modules/common-attributes.adoc[] +:context: installing-mtc +:installing-mtc: + +toc::[] + +You can install the {mtc-full} ({mtc-short}) on {product-title} 4. + +[IMPORTANT] +==== +You must install the same {mtc-short} version on all clusters. +==== + +By default, the {mtc-short} web console and the `Migration Controller` pod run on the target cluster. You can configure the `Migration Controller` custom resource manifest to run the {mtc-short} web console and the `Migration Controller` pod on a link:https://access.redhat.com/articles/5064151[remote cluster]. + +include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+1] + +[id="configuring-replication-repository_{context}"] +== Configuring a replication repository + +You must configure an object storage to use as a replication repository. The {mtc-full} ({mtc-short}) copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster. + +{mtc-short} supports the xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-understanding-data-copy-methods_about-mtc[file system and snapshot data copy methods] for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. + +All clusters must have uninterrupted network access to the replication repository. + +If you use a proxy server with an internally hosted replication repository, you must ensure that the proxy allows access to the replication repository. + +The following storage providers are supported: + +* Multi-Cloud Object Gateway (MCG) +* Amazon Web Services (AWS) S3 +* Google Cloud Provider (GCP) +* Microsoft Azure Blob +* Generic S3 object storage, for example, Minio or Ceph S3 + +include::modules/migration-configuring-mcg.adoc[leveloffset=+2] +include::modules/migration-configuring-aws-s3.adoc[leveloffset=+2] +include::modules/migration-configuring-gcp.adoc[leveloffset=+2] +include::modules/migration-configuring-azure.adoc[leveloffset=+2] + +:installing-mtc!: diff --git a/migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc b/migration-toolkit-for-containers/migrating-applications-with-mtc.adoc similarity index 67% rename from migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc rename to migration-toolkit-for-containers/migrating-applications-with-mtc.adoc index 1591d2b76a..541944ffff 100644 --- a/migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +++ b/migration-toolkit-for-containers/migrating-applications-with-mtc.adoc @@ -1,14 +1,14 @@ -[id="migrating-applications-with-cam-4-2-4"] +[id="migrating-applications-with-mtc_{context}"] = Migrating your applications include::modules/common-attributes.adoc[] -:context: migrating-4-2-4 -:migrating-4-2-4: +:context: migrating-applications-with-mtc toc::[] -You can migrate your applications by using the {mtc-full} ({mtc-short}) web console or on the command line. +You can migrate your applications by using the {mtc-full} ({mtc-short}) web console or from the command line. include::modules/migration-prerequisites.adoc[leveloffset=+1] +include::modules/migration-updating-deprecated-internal-images.adoc[leveloffset=+2] include::modules/migration-creating-ca-bundle.adoc[leveloffset=+2] include::modules/migration-configuring-proxy-for-dvm.adoc[leveloffset=+2] include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2] @@ -16,9 +16,9 @@ include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2] [id="migrating-applications-additional-resources_{context}"] === Additional resources -* xref:../../migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc#migration-about-migration-hooks_migrating-4-2-4[About migration hooks] -* xref:../../migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc#mighook_migrating-4-2-4[MigHook custom resource] -* xref:../../migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc#migplan_migrating-4-2-4[MigPlan custom resource] +* xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-about-migration-hooks_about-mtc[About migration hooks] +* xref:../migration-toolkit-for-containers/migrating-applications-with-mtc.adoc#mighook_migrating-applications-with-mtc[MigHook custom resource] +* xref:../migration-toolkit-for-containers/migrating-applications-with-mtc#migplan_migrating-applications-with-mtc[MigPlan custom resource] [id="migrating-applications-mtc-web-console_{context}"] == Migrating your applications by using the {mtc-short} web console @@ -34,7 +34,7 @@ include::modules/migration-running-migration-plan-cam.adoc[leveloffset=+2] [id="migrating-applications-mtc-cli_{context}"] == Migrating your applications from the command line -You can migrate your applications on the command line by using the {mtc-short} custom resources (CRs). +You can migrate your applications on the command line by creating or editing the {mtc-short} custom resource (CR) manifests. You can migrate applications from a local cluster to a remote cluster, from a remote cluster to a local cluster, and between remote clusters. @@ -60,11 +60,12 @@ include::modules/migration-migrating-applications-api.adoc[leveloffset=+2] include::modules/migration-mtc-cr-manifests.adoc[leveloffset=+2] [id="migrating-applications-mtc-cli-additional-resources_{context}"] -=== Additional resources +== Additional resources -* xref:../../migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc#migration-about-migration-hooks_migrating-4-2-4[About migration hooks] -* xref:../../migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc#mighook_migrating-4-2-4[MigHook custom resource] -* xref:../../migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc#migplan_migrating-4-2-4[MigPlan custom resource] +* xref:../registry/securing-exposing-registry.adoc#registry-exposing-secure-registry-manually_securing-exposing-registry[Exposing a secure registry manually] +* xref:../migration-toolkit-for-containers/about-mtc.adoc#file-system-copy-method_about-mtc[{mtc-short} file system copy method] +* xref:../migration-toolkit-for-containers/about-mtc.adoc#snapshot-copy-method_about-mtc[{mtc-short} snapshot copy method] +* xref:../migration-toolkit-for-containers/troubleshooting-mtc.adoc#migration-viewing-migration-crs_troubleshooting-mtc[Viewing migration custom resources] [id="configuring-migration-plan_{context}"] == Configuring a migration plan @@ -73,5 +74,3 @@ You can increase the number of objects to be migrated or exclude resources from include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+2] include::modules/migration-excluding-resources.adoc[leveloffset=+2] - -:!migrating-4-2-4: diff --git a/migration-toolkit-for-containers/modules b/migration-toolkit-for-containers/modules new file mode 120000 index 0000000000..464b823aca --- /dev/null +++ b/migration-toolkit-for-containers/modules @@ -0,0 +1 @@ +../modules \ No newline at end of file diff --git a/migration/migrating_4_2_4/troubleshooting-4-2-4.adoc b/migration-toolkit-for-containers/troubleshooting-mtc.adoc similarity index 79% rename from migration/migrating_4_2_4/troubleshooting-4-2-4.adoc rename to migration-toolkit-for-containers/troubleshooting-mtc.adoc index 0c80991679..8e1e2c8153 100644 --- a/migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +++ b/migration-toolkit-for-containers/troubleshooting-mtc.adoc @@ -1,8 +1,7 @@ -[id="troubleshooting-4-2-4"] +[id="troubleshooting-mtc"] = Troubleshooting include::modules/common-attributes.adoc[] -:context: migrating-4-2-4 -:migrating-4-2-4: +:context: troubleshooting-mtc toc::[] @@ -38,7 +37,5 @@ include::modules/migration-known-issues.adoc[leveloffset=+1] [id="troubleshooting-additional-resources_{context}"] == Additional resources -* xref:../../migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc#migration-mtc-workflow_migrating-4-2-4[{mtc-short} workflow] -* xref:../../migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc#migration-mtc-custom-resources_migrating-4-2-4[{mtc-short} custom resources] - -:!migrating-4-2-4: +* xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-mtc-workflow_about-mtc[{mtc-short} workflow] +* xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-mtc-custom-resources_about-mtc[{mtc-short} custom resources] diff --git a/migration-toolkit-for-containers/upgrading-mtc.adoc b/migration-toolkit-for-containers/upgrading-mtc.adoc new file mode 100644 index 0000000000..565f95ac7e --- /dev/null +++ b/migration-toolkit-for-containers/upgrading-mtc.adoc @@ -0,0 +1,19 @@ +[id="upgrading-3-4"] += Upgrading the Migration Toolkit for Containers +include::modules/common-attributes.adoc[] +:context: upgrading-3-4 + +toc::[] + +You can upgrade the {mtc-full} ({mtc-short}) by using the {product-title} web console. + +[IMPORTANT] +==== +You must ensure that you upgrade to the same {mtc-short} version on all clusters. + +If you are upgrading from {mtc-short} version 1.3, you must perform an additional procedure to update the `MigPlan` custom resource (CR). +==== + +include::modules/migration-upgrading-mtc-on-ocp-4.adoc[leveloffset=+1] +include::modules/migration-upgrading-mtc-on-ocp-3.adoc[leveloffset=+1] +include::modules/migration-upgrading-from-mtc-1-3.adoc[leveloffset=+1] diff --git a/migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc b/migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc deleted file mode 100644 index 65b0634b34..0000000000 --- a/migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc +++ /dev/null @@ -1,33 +0,0 @@ -[id="configuring-replication-repository-4-1-4"] -= Configuring object storage for a replication repository -include::modules/common-attributes.adoc[] -:context: migrating-4-1-4 -:migrating-4-1-4: - -toc::[] - -You must configure an object storage to use as a replication repository. The {mtc-full} ({mtc-short}) copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster. - -{mtc-short} supports the xref:../../migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc#migration-understanding-data-copy-methods_migrating-4-1-4[file system and snapshot data copy methods] for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. - -The following storage providers are supported: - -* xref:../../migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc#migration-configuring-mcg_migrating-4-1-4[Multi-Cloud Object Gateway (MCG)] -* xref:../../migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc#migration-configuring-aws-s3_migrating-4-1-4[Amazon Web Services (AWS) S3] -* xref:../../migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc#migration-configuring-gcp_migrating-4-1-4[Google Cloud Provider (GCP)] -* xref:../../migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc#migration-configuring-azure_migrating-4-1-4[Microsoft Azure] -* Generic S3 object storage, for example, Minio or Ceph S3 - -In a restricted environment, you can create an internally hosted replication repository. - -.Prerequisites - -* All clusters must have uninterrupted network access to the replication repository. -* If you use a proxy server with an internally hosted replication repository, you must ensure that the proxy allows access to the replication repository. - -include::modules/migration-configuring-mcg.adoc[leveloffset=+1] -include::modules/migration-configuring-aws-s3.adoc[leveloffset=+1] -include::modules/migration-configuring-gcp.adoc[leveloffset=+1] -include::modules/migration-configuring-azure.adoc[leveloffset=+1] - -:!migrating-4-1-4: diff --git a/migration/migrating_4_1_4/deploying-cam-4-1-4.adoc b/migration/migrating_4_1_4/deploying-cam-4-1-4.adoc deleted file mode 100644 index d5a321cff9..0000000000 --- a/migration/migrating_4_1_4/deploying-cam-4-1-4.adoc +++ /dev/null @@ -1,84 +0,0 @@ -[id="deploying-cam-4-1-4"] -= Installing and upgrading the Migration Toolkit for Containers -include::modules/common-attributes.adoc[] -:context: migrating-4-1-4 -:migrating-4-1-4: - -toc::[] - -You can install the {mtc-full} on an {product-title} {product-version} target cluster and on a 4.1 source cluster. - -{mtc-short} is installed on the target cluster by default. You can install the {mtc-short} link:https://access.redhat.com/articles/5064151[on an {product-title} 3 cluster or on a remote cluster]. - -[id="installing-mtc_{context}"] -== Installing the {mtc-full} in a connected environment - -You can install the {mtc-full} ({mtc-short}) in a connected environment. - -[IMPORTANT] -==== -You must install the same {mtc-short} version on all clusters. -==== - -:!migrating-4-1-4: - -:context: target-4-1-4 -:target-4-1-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:target-4-1-4!: - -:context: source-4-1-4 -:source-4-1-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:source-4-1-4!: - -:context: disconnected-4-1-4 -:disconnected-4-1-4: -[id="installing-mtc_{context}"] -== Installing the {mtc-full} in a restricted environment - -You can install the {mtc-full} ({mtc-short}) in a restricted environment. - -[IMPORTANT] -==== -You must install the same {mtc-short} version on all clusters. -==== - -[id="creating-local-operator-catalog_{context}"] -=== Creating a local Operator catalog - -You can create a mirror image of the Operator catalog, push the image to a local registry, and then install the {mtc-full} Operator by using the {product-title} web console. - -include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+3] -include::modules/olm-pruning-index-image.adoc[leveloffset=+3] -include::modules/olm-mirroring-catalog.adoc[leveloffset=+3] -include::modules/olm-creating-catalog-from-index.adoc[leveloffset=+3] -:!disconnected-4-1-4: - -:context: disconnected-target-4-1-4 -:disconnected-target-4-1-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:disconnected-target-4-1-4!: - -:context: disconnected-source-4-1-4 -:disconnected-source-4-1-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:disconnected-source-4-1-4!: - -:context: migrating-4-1-4 -:migrating-4-1-4: -[id="upgrading-the-mtc_{context}"] -== Upgrading the {mtc-full} - -You can upgrade the {mtc-full} ({mtc-short}) by using the {product-title} web console. - -[IMPORTANT] -==== -You must ensure that the same {mtc-short} version is installed on all clusters. - -If you are upgrading {mtc-short} version 1.3, you must perform an additional procedure to update the `MigPlan` custom resource (CR). -==== - -include::modules/migration-upgrading-mtc-on-ocp-4.adoc[leveloffset=+2] -include::modules/migration-upgrading-from-mtc-1-3.adoc[leveloffset=+2] -:!migrating-4-1-4: diff --git a/migration/migrating_4_1_4/images b/migration/migrating_4_1_4/images deleted file mode 120000 index 5fa6987088..0000000000 --- a/migration/migrating_4_1_4/images +++ /dev/null @@ -1 +0,0 @@ -../../images \ No newline at end of file diff --git a/migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc b/migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc deleted file mode 100644 index d6ccf52c0e..0000000000 --- a/migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc +++ /dev/null @@ -1,28 +0,0 @@ -[id="migrating-application-workloads-4-1-4"] -= About the {mtc-full} -include::modules/common-attributes.adoc[] -:context: migrating-4-1-4 -:migrating-4-1-4: - -toc::[] - -You can migrate application workloads from {product-title} 4.1 to {product-version} with the {mtc-full} ({mtc-short}). {mtc-short} enables you to control the migration and to minimize application downtime. - -[NOTE] -==== -You can migrate between {product-title} clusters of the same version, for example, from 4.1 to 4.1, as long as the source and target clusters are configured correctly. - -{mtc-short} is installed on the target cluster by default. You can configure the {mtc-full} Operator to install the {mtc-short} link:https://access.redhat.com/articles/5064151[on a remote cluster]. -==== - -The {mtc-short} web console and API, based on Kubernetes custom resources, enable you to migrate stateful and stateless application workloads at the granularity of a namespace. - -{mtc-short} supports the file system and snapshot data copy methods for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. - -You can use migration hooks to run Ansible playbooks at certain points during the migration. The hooks are added when you create a migration plan. - -include::modules/migration-mtc-workflow.adoc[leveloffset=+1] -include::modules/migration-mtc-custom-resources.adoc[leveloffset=+1] -include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1] -include::modules/migration-about-migration-hooks.adoc[leveloffset=+1] -:!migrating-4-1-4: diff --git a/migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc b/migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc deleted file mode 100644 index 3f1da63ced..0000000000 --- a/migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc +++ /dev/null @@ -1,78 +0,0 @@ -[id="migrating-applications-with-cam-4-1-4"] -= Migrating your applications -include::modules/common-attributes.adoc[] -:context: migrating-4-1-4 -:migrating-4-1-4: - -toc::[] - -You can migrate your applications by using the {mtc-full} ({mtc-short}) web console or on the command line. - -include::modules/migration-prerequisites.adoc[leveloffset=+1] -include::modules/migration-creating-ca-bundle.adoc[leveloffset=+2] -include::modules/migration-configuring-proxy-for-dvm.adoc[leveloffset=+2] -include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2] - -[id="migrating-applications-additional-resources_{context}"] -=== Additional resources - -* xref:../../migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc#migration-about-migration-hooks_migrating-4-1-4[About migration hooks] -* xref:../../migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc#mighook_migrating-4-1-4[MigHook custom resource] -* xref:../../migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc#migplan_migrating-4-1-4[MigPlan custom resource] - -[id="migrating-applications-mtc-web-console_{context}"] -== Migrating your applications using the {mtc-short} web console - -You can configure clusters and a replication repository by using the {mtc-short} web console. Then, you can create and run a migration plan. - -include::modules/migration-launching-cam.adoc[leveloffset=+2] -include::modules/migration-adding-cluster-to-cam.adoc[leveloffset=+2] -include::modules/migration-adding-replication-repository-to-cam.adoc[leveloffset=+2] -include::modules/migration-creating-migration-plan-cam.adoc[leveloffset=+2] -include::modules/migration-running-migration-plan-cam.adoc[leveloffset=+2] - -[id="migrating-applications-mtc-cli_{context}"] -== Migrating your applications from the command line - -You can migrate your applications on the command line by using the {mtc-short} custom resources (CRs). - -You can migrate applications from a local cluster to a remote cluster, from a remote cluster to a local cluster, and between remote clusters. - -[discrete] -=== {mtc-short} terminology - -The following terms are relevant for configuring clusters: - -* `host` cluster: -** The `migration-controller` pod runs on the `host` cluster. -** A `host` cluster does not require an exposed secure registry route for direct image migration. -* Local cluster: The local cluster is often the same as the `host` cluster but this is not a requirement. -* Remote cluster: -** A remote cluster must have an exposed secure registry route for direct image migration. -** A remote cluster must have a `Secret` CR containing the `migration-controller` service account token. - -The following terms are relevant for performing a migration: - -* Source cluster: Cluster from which the applications are migrated. -* Destination cluster: Cluster to which the applications are migrated. - -include::modules/migration-migrating-applications-api.adoc[leveloffset=+2] -include::modules/migration-mtc-cr-manifests.adoc[leveloffset=+2] - -[id="migrating-applications-mtc-cli-additional-resources_{context}"] -== Additional resources - -* xref:../../registry/securing-exposing-registry.adoc#registry-exposing-secure-registry-manually_securing-exposing-registry[Exposing a secure registry manually on an {product-title} 4 cluster] -* xref:../../migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc#file-system-copy-method_migrating-4-1-4[{mtc-short} file system copy method] -* xref:../../migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc#snapshot-copy-method_migrating-4-1-4[{mtc-short} snapshot copy method] -* xref:../../migration/migrating_4_1_4/troubleshooting-4-1-4.adoc#migration-viewing-migration-crs_migrating-4-1-4[Viewing migration custom resources] - -[id="configuring-migration-plan_{context}"] -== Configuring a migration plan - -You can increase the number of objects to be migrated or exclude resources from the migration. - -include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+2] -include::modules/migration-excluding-resources.adoc[leveloffset=+2] - -:!migrating-4-1-4: diff --git a/migration/migrating_4_1_4/modules b/migration/migrating_4_1_4/modules deleted file mode 120000 index 8b0e854007..0000000000 --- a/migration/migrating_4_1_4/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules \ No newline at end of file diff --git a/migration/migrating_4_1_4/troubleshooting-4-1-4.adoc b/migration/migrating_4_1_4/troubleshooting-4-1-4.adoc deleted file mode 100644 index 894037c2a6..0000000000 --- a/migration/migrating_4_1_4/troubleshooting-4-1-4.adoc +++ /dev/null @@ -1,44 +0,0 @@ -[id="troubleshooting-4-1-4"] -= Troubleshooting -include::modules/common-attributes.adoc[] -:context: migrating-4-1-4 -:migrating-4-1-4: - -toc::[] - -You can view the {mtc-full} ({mtc-short}) custom resources and download logs to troubleshoot a failed migration. - -If the application was stopped during the failed migration, you must roll back the migration to prevent data corruption. - -[NOTE] -==== -Manual rollback is not required if the application was not stopped during migration because the original application is still running on the source cluster. -==== - -include::modules/migration-viewing-migration-crs.adoc[leveloffset=+1] -include::modules/migration-using-mig-log-reader.adoc[leveloffset=+1] -include::modules/migration-downloading-logs.adoc[leveloffset=+1] -include::modules/migration-updating-deprecated-gvks.adoc[leveloffset=+1] -include::modules/migration-error-messages.adoc[leveloffset=+1] -include::modules/migration-dvm-error-node-selectors.adoc[leveloffset=+1] -include::modules/migration-debugging-velero-resources.adoc[leveloffset=+1] -include::modules/migration-partial-failure-velero.adoc[leveloffset=+2] -include::modules/migration-using-must-gather.adoc[leveloffset=+1] - -[id="rolling-back-migration_{context}"] -== Rolling back a migration - -You can roll back a migration by using the {mtc-short} web console or the CLI. - -include::modules/migration-rolling-back-migration-web-console.adoc[leveloffset=+2] -include::modules/migration-rolling-back-migration-cli.adoc[leveloffset=+2] - -include::modules/migration-known-issues.adoc[leveloffset=+1] - -[id="troubleshooting-additional-resources_{context}"] -== Additional resources - -* xref:../../migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc#migration-mtc-workflow_migrating-4-1-4[{mtc-short} workflow] -* xref:../../migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc#migration-mtc-custom-resources_migrating-4-1-4[{mtc-short} custom resources] - -:!migrating-4-1-4: diff --git a/migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc b/migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc deleted file mode 100644 index c1cad9fce8..0000000000 --- a/migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc +++ /dev/null @@ -1,33 +0,0 @@ -[id="configuring-replication-repository-4-2-4"] -= Configuring object storage for a replication repository -include::modules/common-attributes.adoc[] -:context: migrating-4-2-4 -:migrating-4-2-4: - -toc::[] - -You must configure an object storage to use as a replication repository. The {mtc-full} ({mtc-short}) copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster. - -{mtc-short} supports the xref:../../migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc#migration-understanding-data-copy-methods_migrating-4-2-4[file system and snapshot data copy methods] for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. - -The following storage providers are supported: - -* xref:../../migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc#migration-configuring-mcg_migrating-4-2-4[Multi-Cloud Object Gateway (MCG)] -* xref:../../migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc#migration-configuring-aws-s3_migrating-4-2-4[Amazon Web Services (AWS) S3] -* xref:../../migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc#migration-configuring-gcp_migrating-4-2-4[Google Cloud Provider (GCP)] -* xref:../../migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc#migration-configuring-azure_migrating-4-2-4[Microsoft Azure] -* Generic S3 object storage, for example, Minio or Ceph S3 - -In a restricted environment, you can create an internally hosted replication repository. - -.Prerequisites - -* All clusters must have uninterrupted network access to the replication repository. -* If you use a proxy server with an internally hosted replication repository, you must ensure that the proxy allows access to the replication repository. - -include::modules/migration-configuring-mcg.adoc[leveloffset=+1] -include::modules/migration-configuring-aws-s3.adoc[leveloffset=+1] -include::modules/migration-configuring-gcp.adoc[leveloffset=+1] -include::modules/migration-configuring-azure.adoc[leveloffset=+1] - -:!migrating-4-2-4: diff --git a/migration/migrating_4_2_4/deploying-cam-4-2-4.adoc b/migration/migrating_4_2_4/deploying-cam-4-2-4.adoc deleted file mode 100644 index 6aaffa8d41..0000000000 --- a/migration/migrating_4_2_4/deploying-cam-4-2-4.adoc +++ /dev/null @@ -1,84 +0,0 @@ -[id="deploying-cam-4-2-4"] -= Installing and upgrading the Migration Toolkit for Containers -include::modules/common-attributes.adoc[] -:context: migrating-4-2-4 -:migrating-4-2-4: - -toc::[] - -You can install the {mtc-full} Operator on your {product-title} {product-version} target cluster and 4.2 source cluster. - -{mtc-short} is installed on the target cluster by default. You can install {mtc-short} link:https://access.redhat.com/articles/5064151[on an {product-title} 3 cluster or on a remote cluster]. - -[IMPORTANT] -==== -You must install the same {mtc-short} version on all clusters. -==== - -[id="installing-mtc_{context}"] -== Installing the {mtc-full} in a connected environment - -You can install the {mtc-full} ({mtc-short}) in a connected environment. - -:!migrating-4-2-4: - -:context: target-4-2-4 -:target-4-2-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:target-4-2-4!: - -:context: source-4-2-4 -:source-4-2-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:source-4-2-4!: - -:context: disconnected-4-2-4 -:disconnected-4-2-4: -[id="installing-mtc_{context}"] -== Installing the {mtc-full} in a restricted environment - -You can install the {mtc-full} ({mtc-short}) in a restricted environment. - -[IMPORTANT] -==== -You must install the same {mtc-short} version on all clusters. -==== - -[id="creating-local-operator-catalog_{context}"] -=== Creating a local Operator catalog - -You can create a mirror image of the Operator catalog, push the image to a local registry, and then install the {mtc-full} Operator by using the {product-title} web console. - -include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+3] -include::modules/olm-pruning-index-image.adoc[leveloffset=+3] -include::modules/olm-mirroring-catalog.adoc[leveloffset=+3] -include::modules/olm-creating-catalog-from-index.adoc[leveloffset=+3] -:!disconnected-4-2-4: - -:context: disconnected-target-4-2-4 -:disconnected-target-4-2-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:disconnected-target-4-2-4!: - -:context: disconnected-source-4-2-4 -:disconnected-source-4-2-4: -include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] -:disconnected-source-4-2-4!: - -:context: migrating-4-2-4 -:migrating-4-2-4: -[id="upgrading-the-mtc_{context}"] -== Upgrading the {mtc-full} - -You can upgrade the {mtc-full} ({mtc-short}) by using the {product-title} web console. - -[IMPORTANT] -==== -You must ensure that the same {mtc-short} version is installed on all clusters. - -If you are upgrading {mtc-short} version 1.3, you must perform an additional procedure to update the `MigPlan` custom resource (CR). -==== - -include::modules/migration-upgrading-mtc-on-ocp-4.adoc[leveloffset=+2] -include::modules/migration-upgrading-from-mtc-1-3.adoc[leveloffset=+2] -:!migrating-4-2-4: diff --git a/migration/migrating_4_2_4/images b/migration/migrating_4_2_4/images deleted file mode 120000 index 5fa6987088..0000000000 --- a/migration/migrating_4_2_4/images +++ /dev/null @@ -1 +0,0 @@ -../../images \ No newline at end of file diff --git a/migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc b/migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc deleted file mode 100644 index 1b2775cf34..0000000000 --- a/migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc +++ /dev/null @@ -1,28 +0,0 @@ -[id="migrating-application-workloads-4-2-4"] -= About the {mtc-full} -include::modules/common-attributes.adoc[] -:context: migrating-4-2-4 -:migrating-4-2-4: - -toc::[] - -You can migrate application workloads from {product-title} 4.2 to {product-version} with the {mtc-full} ({mtc-short}). {mtc-short} enables you to control the migration and to minimize application downtime. - -[NOTE] -==== -You can migrate between {product-title} clusters of the same version, for example, from 4.2 to 4.2 or from 4.3 to 4.3, as long as the source and target clusters are configured correctly. - -{mtc-short} is installed on the target cluster by default. You can configure the {mtc-full} Operator to install the {mtc-short} link:https://access.redhat.com/articles/5064151[on a remote cluster]. -==== - -The {mtc-short} web console and API, based on Kubernetes custom resources, enable you to migrate stateful and stateless application workloads at the granularity of a namespace. - -{mtc-short} supports the file system and snapshot data copy methods for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider. - -You can use migration hooks to run Ansible playbooks at certain points during the migration. The hooks are added when you create a migration plan. - -include::modules/migration-mtc-workflow.adoc[leveloffset=+1] -include::modules/migration-mtc-custom-resources.adoc[leveloffset=+1] -include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1] -include::modules/migration-about-migration-hooks.adoc[leveloffset=+1] -:!migrating-4-2-4: diff --git a/migration/migrating_4_2_4/modules b/migration/migrating_4_2_4/modules deleted file mode 120000 index 8b0e854007..0000000000 --- a/migration/migrating_4_2_4/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules \ No newline at end of file diff --git a/modules/deploy-red-hat-openshift-container-storage.adoc b/modules/deploy-red-hat-openshift-container-storage.adoc index adcedaef0e..23f575bef4 100644 --- a/modules/deploy-red-hat-openshift-container-storage.adoc +++ b/modules/deploy-red-hat-openshift-container-storage.adoc @@ -45,6 +45,6 @@ |link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/troubleshooting_openshift_container_storage/index[Troubleshooting OpenShift Container Storage 4.5] |Migrating your {product-title} cluster from version 3 to version 4 -|link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.5/html/migration/index[Migration] +|link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.7/html/migrating_from_ocp_3_to_4/index[Migration] |=== diff --git a/modules/migration-about-migration-hooks.adoc b/modules/migration-about-migration-hooks.adoc index 058c7195cb..3c38636155 100644 --- a/modules/migration-about-migration-hooks.adoc +++ b/modules/migration-about-migration-hooks.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc.adoc [id="migration-about-migration-hooks_{context}"] = About migration hooks diff --git a/modules/migration-adding-cluster-to-cam.adoc b/modules/migration-adding-cluster-to-cam.adoc index eaa3ea3d32..13a2cc20e7 100644 --- a/modules/migration-adding-cluster-to-cam.adoc +++ b/modules/migration-adding-cluster-to-cam.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-adding-cluster-to-cam_{context}"] = Adding a cluster to the {mtc-short} web console diff --git a/modules/migration-adding-replication-repository-to-cam.adoc b/modules/migration-adding-replication-repository-to-cam.adoc index a24f37a7b3..8306de15c1 100644 --- a/modules/migration-adding-replication-repository-to-cam.adoc +++ b/modules/migration-adding-replication-repository-to-cam.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-adding-replication-repository-to-cam_{context}"] = Adding a replication repository to the {mtc-short} web console diff --git a/modules/migration-changing-migration-plan-limits.adoc b/modules/migration-changing-migration-plan-limits.adoc index e587cd016c..5cb53e131b 100644 --- a/modules/migration-changing-migration-plan-limits.adoc +++ b/modules/migration-changing-migration-plan-limits.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-changing-migration-plan-limits_{context}"] = Increasing limits for large migrations diff --git a/modules/migration-configuring-aws-s3.adoc b/modules/migration-configuring-aws-s3.adoc index f71b23cac0..4a0d0f7a19 100644 --- a/modules/migration-configuring-aws-s3.adoc +++ b/modules/migration-configuring-aws-s3.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/installing-3-4.adoc -// * migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc -// * migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc +// * migration-toolkit-for-containers/installing-mtc.adoc +// * migration-toolkit-for-containers/installing-mtc-restricted.adoc [id="migration-configuring-aws-s3_{context}"] = Configuring Amazon Web Services S3 diff --git a/modules/migration-configuring-azure.adoc b/modules/migration-configuring-azure.adoc index 9e986bd337..132d30cbdc 100644 --- a/modules/migration-configuring-azure.adoc +++ b/modules/migration-configuring-azure.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/installing-3-4.adoc -// * migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc -// * migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc +// * migration-toolkit-for-containers/installing-mtc.adoc +// * migration-toolkit-for-containers/installing-mtc-restricted.adoc [id="migration-configuring-azure_{context}"] = Configuring Microsoft Azure Blob diff --git a/modules/migration-configuring-gcp.adoc b/modules/migration-configuring-gcp.adoc index c4f3471a58..a851fef1d1 100644 --- a/modules/migration-configuring-gcp.adoc +++ b/modules/migration-configuring-gcp.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/installing-3-4.adoc -// * migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc -// * migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc +// * migration-toolkit-for-containers/installing-mtc.adoc +// * migration-toolkit-for-containers/installing-mtc-restricted.adoc [id="migration-configuring-gcp_{context}"] = Configuring Google Cloud Provider diff --git a/modules/migration-configuring-mcg.adoc b/modules/migration-configuring-mcg.adoc index cca67e8063..c5b94ba32c 100644 --- a/modules/migration-configuring-mcg.adoc +++ b/modules/migration-configuring-mcg.adoc @@ -2,8 +2,8 @@ // // * migrating_from_ocp_3_to_4/installing-3-4.adoc // * migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc -// * migration/migrating_4_1_4/configuring-replication-repository-4-1-4.adoc -// * migration/migrating_4_2_4/configuring-replication-repository-4-2-4.adoc +// * migration-toolkit-for-containers/installing-mtc.adoc +// * migration-toolkit-for-containers/installing-mtc-restricted.adoc [id="migration-configuring-mcg_{context}"] = Configuring Multi-Cloud Object Gateway diff --git a/modules/migration-configuring-proxy-for-dvm.adoc b/modules/migration-configuring-proxy-for-dvm.adoc index d3d1480370..0dc1851cf3 100644 --- a/modules/migration-configuring-proxy-for-dvm.adoc +++ b/modules/migration-configuring-proxy-for-dvm.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-configuring-proxy-for-dvm_{context}"] = Configuring a proxy for direct volume migration diff --git a/modules/migration-creating-ca-bundle.adoc b/modules/migration-creating-ca-bundle.adoc index f17ac988a7..e9979c46eb 100644 --- a/modules/migration-creating-ca-bundle.adoc +++ b/modules/migration-creating-ca-bundle.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="creating-ca-bundle_{context}"] = Creating a CA certificate bundle file diff --git a/modules/migration-creating-migration-plan-cam.adoc b/modules/migration-creating-migration-plan-cam.adoc index 62d114c203..5063e10e3b 100644 --- a/modules/migration-creating-migration-plan-cam.adoc +++ b/modules/migration-creating-migration-plan-cam.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-creating-migration-plan-cam_{context}"] = Creating a migration plan in the {mtc-short} web console diff --git a/modules/migration-debugging-velero-resources.adoc b/modules/migration-debugging-velero-resources.adoc index 07ff497eef..89447d224e 100644 --- a/modules/migration-debugging-velero-resources.adoc +++ b/modules/migration-debugging-velero-resources.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-debugging-velero-resources_{context}"] = Using the Velero CLI to debug Backup and Restore CRs diff --git a/modules/migration-downloading-logs.adoc b/modules/migration-downloading-logs.adoc index 76f3f2646f..b5d35359d2 100644 --- a/modules/migration-downloading-logs.adoc +++ b/modules/migration-downloading-logs.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-downloading-logs_{context}"] = Downloading migration logs diff --git a/modules/migration-dvm-error-node-selectors.adoc b/modules/migration-dvm-error-node-selectors.adoc index 66abc4e815..7dd61c98d9 100644 --- a/modules/migration-dvm-error-node-selectors.adoc +++ b/modules/migration-dvm-error-node-selectors.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-dvm-error-node-selectors_{context}"] = Direct volume migration does not complete diff --git a/modules/migration-error-messages.adoc b/modules/migration-error-messages.adoc index 33ee63f5b8..5d8fd847d4 100644 --- a/modules/migration-error-messages.adoc +++ b/modules/migration-error-messages.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-error-messages_{context}"] = Error messages and resolutions diff --git a/modules/migration-excluding-resources.adoc b/modules/migration-excluding-resources.adoc index bb984826ba..4b6d920c59 100644 --- a/modules/migration-excluding-resources.adoc +++ b/modules/migration-excluding-resources.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-excluding-resources_{context}"] = Excluding resources from a migration plan diff --git a/modules/migration-installing-mtc-on-ocp-3.adoc b/modules/migration-installing-mtc-on-ocp-3.adoc index 1fd8a8bc95..96cabe7e6b 100644 --- a/modules/migration-installing-mtc-on-ocp-3.adoc +++ b/modules/migration-installing-mtc-on-ocp-3.adoc @@ -2,8 +2,8 @@ // // * migrating_from_ocp_3_to_4/installing-3-4.adoc // * migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_2_4/deploying-cam-4-2-4.adoc +// * migration-toolkit-for-containers/installing-mtc.adoc +// * migration-toolkit-for-containers/installing-mtc-restricted.adoc [id="migration-installing-mtc-on-ocp-3_{context}"] = Installing the {mtc-full} Operator on {product-title} 3 diff --git a/modules/migration-installing-mtc-on-ocp-4.adoc b/modules/migration-installing-mtc-on-ocp-4.adoc index aaf50c2770..649c2f32de 100644 --- a/modules/migration-installing-mtc-on-ocp-4.adoc +++ b/modules/migration-installing-mtc-on-ocp-4.adoc @@ -2,17 +2,19 @@ // // * migrating_from_ocp_3_to_4/installing-3-4.adoc // * migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc +// * migration-toolkit-for-containers/installing-mtc.adoc +// * migration-toolkit-for-containers/installing-mtc-restricted.adoc [id="migration-installing-mtc-on-ocp-4_{context}"] -= Installing the {mtc-full} Operator on {product-title} {product-version} += Installing the {mtc-full} Operator on {product-title} 4 -You can install the {mtc-short} Operator on {product-title} {product-version} by using the {product-title} web console. +You can install the {mtc-short} Operator on {product-title} 4 by using the {product-title} web console. .Prerequisites * You must be logged in as a user with `cluster-admin` privileges on all clusters. -ifdef::installing-restricted-3-4[] -* You must have access to an Operator catalog in a local registry. +ifdef::installing-restricted-3-4,installing-mtc-restricted[] +* You must create an Operator catalog from a mirror image in a local registry. See xref:../operators/admin/olm-restricted-networks.adoc[Using Operator Lifecycle Manager on restricted networks] for instructions. endif::[] .Procedure @@ -20,11 +22,13 @@ endif::[] . In the {product-title} web console, click *Operators* -> *OperatorHub*. . Use the *Filter by keyword* field to find the *{mtc-full} Operator*. . Select the *{mtc-full} Operator* and click *Install*. +ifdef::installing-3-4,installing-mtc[] + [NOTE] ==== Do not change the subscription approval option to *Automatic*. The {mtc-full} version must be the same on the source and the target clusters. ==== +endif::[] . Click *Install*. + @@ -33,8 +37,7 @@ On the *Installed Operators* page, the *{mtc-full} Operator* appears in the *ope . Click *{mtc-full} Operator*. . Under *Provided APIs*, locate the *Migration Controller* tile, and click *Create Instance*. -ifdef::source-4-1-4[] -. Update the following parameters in the `migration-controller` custom resource manifest: +. If you do not want to run the {mtc-short} web console and the `Migration Controller` pod on the cluster, update the following parameters in the `migration-controller` custom resource manifest: + [source,yaml] ---- @@ -45,19 +48,7 @@ spec: ... deprecated_cors_configuration: true <1> ---- -<1> Add the `deprecated_cors_configuration` parameter and its value. -endif::[] -ifdef::source-4-2-4[] -. Update the following parameters in in the `migration-controller` custom resource manifest: -+ -[source,yaml] ----- -spec: -... - migration_controller: false - migration_ui: false ----- -endif::[] +<1> This parameter is required only for {product-title} 4.1. . Click *Create*. . Click *Workloads* -> *Pods* to verify that the {mtc-short} pods are running. diff --git a/modules/migration-known-issues.adoc b/modules/migration-known-issues.adoc index 2005d58f15..743fbc5b9d 100644 --- a/modules/migration-known-issues.adoc +++ b/modules/migration-known-issues.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-known-issues_{context}"] = Known issues diff --git a/modules/migration-launching-cam.adoc b/modules/migration-launching-cam.adoc index f6bb967c7e..11f54ecedc 100644 --- a/modules/migration-launching-cam.adoc +++ b/modules/migration-launching-cam.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-launching-cam_{context}"] = Launching the {mtc-short} web console diff --git a/modules/migration-migrating-applications-api.adoc b/modules/migration-migrating-applications-api.adoc index 4dc8bba3be..705f46bcc9 100644 --- a/modules/migration-migrating-applications-api.adoc +++ b/modules/migration-migrating-applications-api.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-migrating-applications-api_{context}"] = Migrating your applications with the {mtc-full} API diff --git a/modules/migration-mtc-cr-manifests.adoc b/modules/migration-mtc-cr-manifests.adoc index ab0740f7ef..e4944944a4 100644 --- a/modules/migration-mtc-cr-manifests.adoc +++ b/modules/migration-mtc-cr-manifests.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-mtc-cr-manifests_{context}"] = {mtc-short} custom resource manifests diff --git a/modules/migration-mtc-custom-resources.adoc b/modules/migration-mtc-custom-resources.adoc index 86d850639e..32a7c1c857 100644 --- a/modules/migration-mtc-custom-resources.adoc +++ b/modules/migration-mtc-custom-resources.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc.adoc [id="migration-mtc-custom-resources_{context}"] = {mtc-full} custom resources diff --git a/modules/migration-mtc-workflow.adoc b/modules/migration-mtc-workflow.adoc index bdfce271a3..7b89ba25ab 100644 --- a/modules/migration-mtc-workflow.adoc +++ b/modules/migration-mtc-workflow.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc.adoc [id="migration-mtc-workflow_{context}"] = {mtc-full} workflow diff --git a/modules/migration-partial-failure-velero.adoc b/modules/migration-partial-failure-velero.adoc index 07b54375a4..3314c2f769 100644 --- a/modules/migration-partial-failure-velero.adoc +++ b/modules/migration-partial-failure-velero.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-partial-failure-velero_{context}"] = Debugging a partial migration failure diff --git a/modules/migration-prerequisites.adoc b/modules/migration-prerequisites.adoc index 766c66e0be..6915e61d7e 100644 --- a/modules/migration-prerequisites.adoc +++ b/modules/migration-prerequisites.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-prerequisites_{context}"] = Prerequisites diff --git a/modules/migration-rolling-back-migration-cli.adoc b/modules/migration-rolling-back-migration-cli.adoc index 3aa2b9468a..9f0d2374e5 100644 --- a/modules/migration-rolling-back-migration-cli.adoc +++ b/modules/migration-rolling-back-migration-cli.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-rolling-back-migration-cli_{context}"] == Rolling back a migration from the CLI diff --git a/modules/migration-rolling-back-migration-web-console.adoc b/modules/migration-rolling-back-migration-web-console.adoc index d100d3ba6e..6a4592a22a 100644 --- a/modules/migration-rolling-back-migration-web-console.adoc +++ b/modules/migration-rolling-back-migration-web-console.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-rolling-back-migration-web-console_{context}"] = Rolling back a migration in the {mtc-short} web console diff --git a/modules/migration-running-migration-plan-cam.adoc b/modules/migration-running-migration-plan-cam.adoc index 506c15297e..c256eecf00 100644 --- a/modules/migration-running-migration-plan-cam.adoc +++ b/modules/migration-running-migration-plan-cam.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-running-migration-plan-cam_{context}"] = Running a migration plan in the {mtc-short} web console diff --git a/modules/migration-understanding-data-copy-methods.adoc b/modules/migration-understanding-data-copy-methods.adoc index 614946fd9b..1a0807e112 100644 --- a/modules/migration-understanding-data-copy-methods.adoc +++ b/modules/migration-understanding-data-copy-methods.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-application-workloads-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-application-workloads-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc.adoc [id="migration-understanding-data-copy-methods_{context}"] = About data copy methods diff --git a/modules/migration-updating-deprecated-gvks.adoc b/modules/migration-updating-deprecated-gvks.adoc index 052f059ea9..d6ce77cd93 100644 --- a/modules/migration-updating-deprecated-gvks.adoc +++ b/modules/migration-updating-deprecated-gvks.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-gvk-incompatibility_{context}"] = Updating deprecated APIs diff --git a/modules/migration-updating-deprecated-internal-images.adoc b/modules/migration-updating-deprecated-internal-images.adoc index 7abaf7faf0..f7c681d40f 100644 --- a/modules/migration-updating-deprecated-internal-images.adoc +++ b/modules/migration-updating-deprecated-internal-images.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-updating-deprecated-internal-images_{context}"] = Updating deprecated internal images with podman diff --git a/modules/migration-upgrading-from-mtc-1-3.adoc b/modules/migration-upgrading-from-mtc-1-3.adoc index 3e16157e0a..457435837c 100644 --- a/modules/migration-upgrading-from-mtc-1-3.adoc +++ b/modules/migration-upgrading-from-mtc-1-3.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/upgrading-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-2-4.adoc +// * migration-toolkit-for-containers/upgrading-mtc.adoc [id="migration-upgrading-from-mtc-1-3_{context}"] = Upgrading {mtc-short} 1.3 to {mtc-version} diff --git a/modules/migration-upgrading-mtc-on-ocp-3.adoc b/modules/migration-upgrading-mtc-on-ocp-3.adoc index 4c37e1d094..5cba3ce7e6 100644 --- a/modules/migration-upgrading-mtc-on-ocp-3.adoc +++ b/modules/migration-upgrading-mtc-on-ocp-3.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/upgrading-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-2-4.adoc +// * migration-toolkit-for-containers/upgrading-mtc.adoc [id="migration-upgrading-mtc-on-ocp-3_{context}"] = Upgrading the {mtc-full} on {product-title} 3 diff --git a/modules/migration-upgrading-mtc-on-ocp-4.adoc b/modules/migration-upgrading-mtc-on-ocp-4.adoc index d4cc9e1058..270fb08f18 100644 --- a/modules/migration-upgrading-mtc-on-ocp-4.adoc +++ b/modules/migration-upgrading-mtc-on-ocp-4.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/upgrading-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-2-4.adoc +// * migration-toolkit-for-containers/upgrading-mtc.adoc [id="migration-upgrading-mtc-on-ocp-4_{context}"] = Upgrading the {mtc-full} on {product-title} 4 diff --git a/modules/migration-using-mig-log-reader.adoc b/modules/migration-using-mig-log-reader.adoc index 9f4042ae01..7e205ab518 100644 --- a/modules/migration-using-mig-log-reader.adoc +++ b/modules/migration-using-mig-log-reader.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-using-mig-log-reader_{context}"] = Using the migration log reader diff --git a/modules/migration-using-must-gather.adoc b/modules/migration-using-must-gather.adoc index c7ce4b9be4..7157450426 100644 --- a/modules/migration-using-must-gather.adoc +++ b/modules/migration-using-must-gather.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-using-must-gather_{context}"] = Using must-gather to collect data diff --git a/modules/migration-viewing-migration-crs.adoc b/modules/migration-viewing-migration-crs.adoc index c7c977001f..0b7714444b 100644 --- a/modules/migration-viewing-migration-crs.adoc +++ b/modules/migration-viewing-migration-crs.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc -// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc -// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc +// * migration-toolkit-for-containers/troubleshooting-mtc [id="migration-viewing-migration-crs_{context}"] = Viewing {mtc-short} custom resources diff --git a/modules/migration-writing-ansible-playbook-hook.adoc b/modules/migration-writing-ansible-playbook-hook.adoc index 84ad677201..3acb962905 100644 --- a/modules/migration-writing-ansible-playbook-hook.adoc +++ b/modules/migration-writing-ansible-playbook-hook.adoc @@ -1,8 +1,7 @@ // Module included in the following assemblies: // // * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc -// * migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc -// * migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc +// * migration-toolkit-for-containers/migrating-applications-with-mtc [id="migration-writing-ansible-playbook-hook_{context}"] = Writing an Ansible playbook for a migration hook diff --git a/modules/olm-creating-catalog-from-index.adoc b/modules/olm-creating-catalog-from-index.adoc index dff8bc60b2..41ce61c3c6 100644 --- a/modules/olm-creating-catalog-from-index.adoc +++ b/modules/olm-creating-catalog-from-index.adoc @@ -2,9 +2,6 @@ // // * operators/admin/olm-restricted-networks.adoc // * operators/admin/managing-custom-catalogs.adoc -// * migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_2_4/deploying-cam-4-2-4.adoc ifdef::openshift-origin[] :index-image: catalog diff --git a/modules/olm-mirroring-catalog.adoc b/modules/olm-mirroring-catalog.adoc index cf371cf445..72e8c12d2f 100644 --- a/modules/olm-mirroring-catalog.adoc +++ b/modules/olm-mirroring-catalog.adoc @@ -1,9 +1,6 @@ // Module included in the following assemblies: // // * operators/admin/olm-restricted-networks.adoc -// * migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_2_4/deploying-cam-4-2-4.adoc ifdef::openshift-origin[] :index-image-pullspec: quay.io/operatorhubio/catalog:latest diff --git a/modules/olm-pruning-index-image.adoc b/modules/olm-pruning-index-image.adoc index 95517334df..69e072d4bf 100644 --- a/modules/olm-pruning-index-image.adoc +++ b/modules/olm-pruning-index-image.adoc @@ -2,9 +2,6 @@ // // * operators/admin/olm-restricted-networks.adoc // * operators/admin/olm-managing-custom-catalogs.adoc -// * migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc -// * migration/migrating_4_1_4/deploying-cam-4-1-4.adoc -// * migration/migrating_4_2_4/deploying-cam-4-2-4.adoc ifdef::openshift-origin[] :catalog-name: catalog