From d08b8fc071b40c5741e9244dddd409ae9b4cc26f Mon Sep 17 00:00:00 2001 From: Avital Pinnick Date: Tue, 11 May 2021 17:12:51 +0300 Subject: [PATCH] BZ1959400: Break out OCP 3 to 4 migration into top level doc --- _topic_map.yml | 36 ++++++++------- installing/installing-preparing.adoc | 2 +- .../about-migrating-from-3-to-4.adoc | 12 ++--- .../about-mtc-3-4.adoc | 28 ++++-------- ...onfiguring-replication-repository-3-4.adoc | 30 +++++++++++++ migrating_from_ocp_3_to_4/images | 1 + .../installing-and-upgrading-3-4.adoc | 21 ++++----- .../migrating-applications-3-4.adoc | 22 +++++----- migrating_from_ocp_3_to_4/modules | 1 + .../planning-migration-3-4.adoc | 44 +++++++++---------- .../troubleshooting-3-4.adoc | 9 ++-- ...onfiguring-replication-repository-3-4.adoc | 33 -------------- migration/migrating_3_4/images | 1 - migration/migrating_3_4/modules | 1 - modules/migration-about-migration-hooks.adoc | 3 +- modules/migration-adding-cluster-to-cam.adoc | 2 +- ...-adding-replication-repository-to-cam.adoc | 2 +- ...ration-changing-migration-plan-limits.adoc | 2 +- modules/migration-configuring-aws-s3.adoc | 2 +- modules/migration-configuring-azure.adoc | 2 +- modules/migration-configuring-gcp.adoc | 2 +- modules/migration-configuring-mcg.adoc | 2 +- .../migration-configuring-proxy-for-dvm.adoc | 3 +- modules/migration-creating-ca-bundle.adoc | 3 +- ...migration-creating-migration-plan-cam.adoc | 2 +- .../migration-debugging-velero-resources.adoc | 3 +- modules/migration-downloading-logs.adoc | 2 +- .../migration-dvm-error-node-selectors.adoc | 3 +- modules/migration-error-messages.adoc | 2 +- modules/migration-excluding-resources.adoc | 3 +- .../migration-installing-mtc-on-ocp-3.adoc | 20 +++++---- .../migration-installing-mtc-on-ocp-4.adoc | 12 ++--- modules/migration-known-issues.adoc | 2 +- modules/migration-launching-cam.adoc | 2 +- .../migration-migrating-applications-api.adoc | 2 +- modules/migration-mtc-cr-manifests.adoc | 2 +- modules/migration-mtc-custom-resources.adoc | 3 +- modules/migration-mtc-workflow.adoc | 2 +- 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 | 2 +- ...ation-understanding-data-copy-methods.adoc | 2 +- .../migration-updating-deprecated-gvks.adoc | 4 +- ...n-updating-deprecated-internal-images.adoc | 2 +- modules/migration-upgrading-from-mtc-1-3.adoc | 5 ++- modules/migration-upgrading-mtc-on-ocp-3.adoc | 4 +- modules/migration-upgrading-mtc-on-ocp-4.adoc | 5 ++- modules/migration-using-mig-log-reader.adoc | 2 +- modules/migration-using-must-gather.adoc | 2 +- modules/migration-viewing-migration-crs.adoc | 3 +- ...gration-writing-ansible-playbook-hook.adoc | 3 +- modules/olm-creating-catalog-from-index.adoc | 2 +- modules/olm-mirroring-catalog.adoc | 2 +- modules/olm-pruning-index-image.adoc | 2 +- ...cted-networks-configuring-operatorhub.adoc | 2 +- 57 files changed, 190 insertions(+), 188 deletions(-) rename migration/migrating_3_4/about-migration.adoc => migrating_from_ocp_3_to_4/about-migrating-from-3-to-4.adoc (59%) rename migration/migrating_3_4/migrating-application-workloads-3-4.adoc => migrating_from_ocp_3_to_4/about-mtc-3-4.adoc (70%) create mode 100644 migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc create mode 120000 migrating_from_ocp_3_to_4/images rename migration/migrating_3_4/deploying-cam-3-4.adoc => migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc (90%) rename migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc => migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc (69%) create mode 120000 migrating_from_ocp_3_to_4/modules rename migration/migrating_3_4/planning-migration-3-to-4.adoc => migrating_from_ocp_3_to_4/planning-migration-3-4.adoc (74%) rename {migration/migrating_3_4 => migrating_from_ocp_3_to_4}/troubleshooting-3-4.adoc (81%) delete mode 100644 migration/migrating_3_4/configuring-replication-repository-3-4.adoc delete mode 120000 migration/migrating_3_4/images delete mode 120000 migration/migrating_3_4/modules diff --git a/_topic_map.yml b/_topic_map.yml index a940071920..24d5eb831d 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -1926,27 +1926,29 @@ Topics: - Name: Recovering from expired control plane certificates File: scenario-3-expired-certs --- +Name: Migrating from OpenShift Container Platform 3 to 4 +Dir: migrating_from_ocp_3_to_4 +Distros: openshift-enterprise,openshift-origin +Topics: +- Name: About migrating from OpenShift Container Platform 3 to 4 + File: about-migrating-from-3-to-4 +- Name: Planning your migration + File: planning-migration-3-4 +- Name: About the Migration Toolkit for Containers + File: about-mtc-3-4 +- Name: Installing and upgrading the Migration Toolkit for Containers + File: installing-and-upgrading-3-4 +- Name: Configuring object storage for a replication repository + File: configuring-replication-repository-3-4 +- Name: Migrating your applications + File: migrating-applications-3-4 +- Name: Troubleshooting + File: troubleshooting-3-4 +--- Name: Migration Toolkit for Containers Dir: migration Distros: openshift-enterprise,openshift-origin Topics: -- Name: Migrating from OpenShift Container Platform 3 - Dir: migrating_3_4 - Topics: - - Name: About migrating from OpenShift Container Platform 3 to 4 - File: about-migration - - Name: Planning your migration from OpenShift Container Platform 3 to 4 - File: planning-migration-3-to-4 - - Name: About the Migration Toolkit for Containers - File: migrating-application-workloads-3-4 - - Name: Installing and upgrading the Migration Toolkit for Containers - File: deploying-cam-3-4 - - Name: Configuring object storage for a replication repository - File: configuring-replication-repository-3-4 - - Name: Migrating your applications - File: migrating-applications-with-cam-3-4 - - Name: Troubleshooting - File: troubleshooting-3-4 - Name: Migrating from OpenShift Container Platform 4.1 Dir: migrating_4_1_4 Topics: diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc index d77bc4275c..0715ca967a 100644 --- a/installing/installing-preparing.adoc +++ b/installing/installing-preparing.adoc @@ -34,7 +34,7 @@ If you want to use {product-title} but do not want to manage the cluster yoursel [id="installing-preparing-migrate"] === Have you used {product-title} 3 and want to use {product-title} 4? -If you used {product-title} 3 and want to try {product-title} 4, you need to understand how different {product-title} 4 is. {product-title} 4 weaves the Operators that package, deploy, and manage Kubernetes applications and the operating system that the platform runs on, {op-system-first}, together seamlessly. Instead of deploying machines and configuring their operating systems so that you can install {product-title} on them, the {op-system} operating system is an integral part of the {product-title} cluster. Deploying the operating system for the cluster machines as part of the installation process for {product-title}. See xref:../migration/migrating_3_4/planning-migration-3-to-4.adoc#migration-comparing-ocp-3-4[Comparing OpenShift Container Platform 3 and OpenShift Container Platform 4]. +If you used {product-title} 3 and want to try {product-title} 4, you need to understand how different {product-title} 4 is. {product-title} 4 weaves the Operators that package, deploy, and manage Kubernetes applications and the operating system that the platform runs on, {op-system-first}, together seamlessly. Instead of deploying machines and configuring their operating systems so that you can install {product-title} on them, the {op-system} operating system is an integral part of the {product-title} cluster. Deploying the operating system for the cluster machines as part of the installation process for {product-title}. See xref:../migrating_from_ocp_3_to_4/planning-migration-3-4.adoc#migration-comparing-ocp-3-4[Comparing OpenShift Container Platform 3 and OpenShift Container Platform 4]. Because you need to provision machines as part of the {product-title} cluster installation process, you cannot upgrade an {product-title} 3 cluster to {product-title} 4. Instead, you must create a new {product-title} 4 cluster and migrate your {product-title} 3 workloads to them. For more information about migrating, see link:https://redhat-cop.github.io/openshift-migration-best-practices/01-planning.html[OpenShift Migration Best Practices]. Because you must migrate to {product-title} 4, you can use any type of production cluster installation process to create your new cluster. diff --git a/migration/migrating_3_4/about-migration.adoc b/migrating_from_ocp_3_to_4/about-migrating-from-3-to-4.adoc similarity index 59% rename from migration/migrating_3_4/about-migration.adoc rename to migrating_from_ocp_3_to_4/about-migrating-from-3-to-4.adoc index 5ed6659d15..5f4bc8a75d 100644 --- a/migration/migrating_3_4/about-migration.adoc +++ b/migrating_from_ocp_3_to_4/about-migrating-from-3-to-4.adoc @@ -1,7 +1,7 @@ -[id="about-migration"] -= About migrating {product-title} 3 to 4 +[id="about-migrating-from-3-to-4"] += About migrating from {product-title} 3 to 4 include::modules/common-attributes.adoc[] -:context: about-migration +:context: about-migrating-from-3-to-4 toc::[] @@ -9,8 +9,8 @@ toc::[] To successfully transition from {product-title} 3 to {product-title} 4, it is important that you review the following information: -xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#planning-migration-3-to-4[Planning your transition]:: +xref:../migrating_from_ocp_3_to_4/planning-migration-3-4.adoc#planning-migration-3-4[Planning your transition]:: Learn about the differences between {product-title} versions 3 and 4. Prior to transitioning, be sure that you have reviewed and prepared for storage, networking, logging, security, and monitoring considerations. -xref:../../migration/migrating_3_4/migrating-application-workloads-3-4.adoc#migrating-application-workloads-3-4[Performing your migration]:: -Learn about and use {mtc-full} ({mtc-short}) to migrate your application workloads. +xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#about-mtc-3-4[About the {mtc-full}]:: +Learn about the {mtc-full} ({mtc-short}) to migrate your application workloads. diff --git a/migration/migrating_3_4/migrating-application-workloads-3-4.adoc b/migrating_from_ocp_3_to_4/about-mtc-3-4.adoc similarity index 70% rename from migration/migrating_3_4/migrating-application-workloads-3-4.adoc rename to migrating_from_ocp_3_to_4/about-mtc-3-4.adoc index a2a5a79169..353fda9307 100644 --- a/migration/migrating_3_4/migrating-application-workloads-3-4.adoc +++ b/migrating_from_ocp_3_to_4/about-mtc-3-4.adoc @@ -1,40 +1,28 @@ -[id="migrating-application-workloads-3-4"] +[id="about-mtc-3-4"] = About the {mtc-full} include::modules/common-attributes.adoc[] -:context: migrating-3-4 -:migrating-3-4: +:context: about-mtc-3-4 toc::[] +The {mtc-short} web console and API, based on Kubernetes custom resources, enable you to migrate stateful application workloads at the granularity of a namespace. + You can migrate application workloads from {product-title} 3.7, 3.9, 3.10, and 3.11 to {product-title} {product-version} with the {mtc-full} ({mtc-short}). {mtc-short} enables you to control the migration and to minimize application downtime. -[NOTE] +[IMPORTANT] ==== -{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 an {product-title} 3 cluster or on a remote cluster]. +Before you begin your migration, be sure to review the information on xref:../migrating_from_ocp_3_to_4/planning-migration-3-4.adoc#planning-migration-3-4[planning your migration]. ==== -The {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 an link:https://access.redhat.com/articles/5064151[{product-title} 3 source cluster or on a 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. -[NOTE] -==== -The service catalog is deprecated in {product-title} 4. You can migrate workload resources provisioned with the service catalog from {product-title} 3 to 4 but you cannot perform service catalog actions such as `provision`, `deprovision`, or `update` on these workloads after migration. - -The {mtc-short} web console displays a message if the service catalog resources cannot be migrated. -==== - -[IMPORTANT] -==== -Before you begin your migration, be sure to review the information on xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#planning-migration-3-to-4[planning your migration]. -==== +The service catalog is deprecated in {product-title} 4. You can migrate workload resources provisioned with the service catalog from {product-title} 3 to 4 but you cannot perform service catalog actions such as `provision`, `deprovision`, or `update` on these workloads after migration. The {mtc-short} console displays a message if the service catalog resources cannot be migrated. 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-3-4: 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 new file mode 100644 index 0000000000..9fda0d694f --- /dev/null +++ b/migrating_from_ocp_3_to_4/configuring-replication-repository-3-4.adoc @@ -0,0 +1,30 @@ +[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/images b/migrating_from_ocp_3_to_4/images new file mode 120000 index 0000000000..5e67573196 --- /dev/null +++ b/migrating_from_ocp_3_to_4/images @@ -0,0 +1 @@ +../images \ No newline at end of file diff --git a/migration/migrating_3_4/deploying-cam-3-4.adoc b/migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc similarity index 90% rename from migration/migrating_3_4/deploying-cam-3-4.adoc rename to migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc index 0d9efb3af7..50a028a846 100644 --- a/migration/migrating_3_4/deploying-cam-3-4.adoc +++ b/migrating_from_ocp_3_to_4/installing-and-upgrading-3-4.adoc @@ -1,8 +1,8 @@ -[id='deploying-cam-3-4'] +[id='installing-and-upgrading-3-4'] = Installing and upgrading the Migration Toolkit for Containers include::modules/common-attributes.adoc[] -:context: migrating-3-4 -:migrating-3-4: +:context: installing-3-4 +:installing-3-4: toc::[] @@ -22,10 +22,11 @@ You must install the same {mtc-short} version on all clusters. include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] include::modules/migration-installing-mtc-on-ocp-3.adoc[leveloffset=+2] -:!migrating-3-4: -:context: disconnected-3-4 -:disconnected-3-4: +:!installing-3-4: + +:context: installing-disconnected-3-4 +:installing-disconnected-3-4: [id='installing-mtc_{context}'] == Installing the {mtc-full} in a restricted environment @@ -45,10 +46,10 @@ include::modules/olm-creating-catalog-from-index.adoc[leveloffset=+3] include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+2] include::modules/migration-installing-mtc-on-ocp-3.adoc[leveloffset=+2] -:!disconnected-3-4: +:!installing-disconnected-3-4: -:context: migrating-3-4 -:migrating-3-4: +:context: upgrading-3-4 +:upgrading-3-4: [id="upgrading-the-mtc_{context}"] == Upgrading the {mtc-full} @@ -64,4 +65,4 @@ If you are upgrading {mtc-short} version 1.3, you must perform an additional pro include::modules/migration-upgrading-mtc-on-ocp-4.adoc[leveloffset=+2] include::modules/migration-upgrading-mtc-on-ocp-3.adoc[leveloffset=+2] include::modules/migration-upgrading-from-mtc-1-3.adoc[leveloffset=+2] -:!migrating-3-4: +:!upgrading-3-4: diff --git a/migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc b/migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc similarity index 69% rename from migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc rename to migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc index e4a99149ea..e90c23f096 100644 --- a/migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +++ b/migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc @@ -1,8 +1,7 @@ -[id='migrating-applications-with-cam_{context}'] +[id='migrating-applications-3-4_{context}'] = Migrating your applications include::modules/common-attributes.adoc[] -:context: migrating-3-4 -:migrating-3-4: +:context: migrating-applications-3-4 toc::[] @@ -17,9 +16,9 @@ include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2] [id="migrating-applications-additional-resources_{context}"] === Additional resources -* xref:../../migration/migrating_3_4/migrating-application-workloads-3-4.adoc#migration-about-migration-hooks_migrating-3-4[About migration hooks] -* xref:../../migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc#mighook_migrating-3-4[MigHook custom resource] -* xref:../../migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc#migplan_migrating-3-4[MigPlan custom resource] +* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-about-migration-hooks_about-mtc-3-4[About migration hooks] +* xref:../migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc#mighook_migrating-applications-3-4[MigHook custom resource] +* xref:../migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc#migplan_migrating-applications-3-4[MigPlan custom resource] [id="migrating-applications-mtc-web-console_{context}"] == Migrating your applications by using the {mtc-short} web console @@ -35,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. @@ -63,10 +62,10 @@ 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_3_4/migrating-application-workloads-3-4.adoc#file-system-copy-method_migrating-3-4[{mtc-short} file system copy method] -* xref:../../migration/migrating_3_4/migrating-application-workloads-3-4.adoc#snapshot-copy-method_migrating-3-4[{mtc-short} snapshot copy method] -* xref:../../migration/migrating_3_4/troubleshooting-3-4.adoc#migration-viewing-migration-crs_migrating-3-4[Viewing migration custom 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:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#file-system-copy-method_about-mtc-3-4[{mtc-short} file system copy method] +* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#snapshot-copy-method_about-mtc-3-4[{mtc-short} snapshot copy method] +* xref:../migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc#migration-viewing-migration-crs_troubleshooting-3-4[Viewing migration custom resources] [id='configuring-migration-plan_{context}'] == Configuring a migration plan @@ -75,4 +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-3-4: diff --git a/migrating_from_ocp_3_to_4/modules b/migrating_from_ocp_3_to_4/modules new file mode 120000 index 0000000000..464b823aca --- /dev/null +++ b/migrating_from_ocp_3_to_4/modules @@ -0,0 +1 @@ +../modules \ No newline at end of file diff --git a/migration/migrating_3_4/planning-migration-3-to-4.adoc b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc similarity index 74% rename from migration/migrating_3_4/planning-migration-3-to-4.adoc rename to migrating_from_ocp_3_to_4/planning-migration-3-4.adoc index ae6b7cea72..c07f0c045a 100644 --- a/migration/migrating_3_4/planning-migration-3-to-4.adoc +++ b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc @@ -1,7 +1,7 @@ -[id="planning-migration-3-to-4"] +[id="planning-migration-3-4"] = Planning your migration include::modules/common-attributes.adoc[] -:context: planning-migration-3-to-4 +:context: planning-migration-3-4 toc::[] @@ -13,7 +13,7 @@ This planning document assumes that you are transitioning from {product-title} 3 ==== ifndef::openshift-origin[] -This document provides high-level information on the most important xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#migration-comparing-ocp-3-4[differences between {product-title} 3 and {product-title} 4] and the most noteworthy xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#migration-considerations[migration considerations]. For detailed information on configuring your {product-title} 4 cluster, review the appropriate sections of the {product-title} documentation. For detailed information on new features and other notable technical changes, review the xref:../../release_notes/ocp-4-8-release-notes.adoc#ocp-4-8-release-notes[OpenShift Container Platform 4.8 release notes]. +This document provides high-level information on the most important xref:../migrating_from_ocp_3_to_4/planning-migration-3-4.adoc#migration-comparing-ocp-3-4[differences between {product-title} 3 and {product-title} 4] and the most noteworthy xref:../migrating_from_ocp_3_to_4/planning-migration-3-4.adoc#migration-considerations[migration considerations]. For detailed information on configuring your {product-title} 4 cluster, review the appropriate sections of the {product-title} documentation. For detailed information on new features and other notable technical changes, review the xref:../release_notes/ocp-4-8-release-notes.adoc#ocp-4-8-release-notes[OpenShift Container Platform 4.8 release notes]. endif::[] It is not possible to upgrade your existing {product-title} 3 cluster to {product-title} 4. You must start with a new {product-title} 4 installation. Tools are available to assist in migrating your control plane settings and application workloads. @@ -24,7 +24,7 @@ With {product-title} 3, administrators individually deployed {op-system-base-ful {product-title} 4 represents a significant change in the way that {product-title} clusters are deployed and managed. {product-title} 4 includes new technologies and functionality, such as Operators, machine sets, and {op-system-first}, which are core to the operation of the cluster. This technology shift enables clusters to self-manage some functions previously performed by administrators. This also ensures platform stability and consistency, and simplifies installation and scaling. -For more information, see xref:../../architecture/architecture.adoc#architecture[OpenShift Container Platform architecture]. +For more information, see xref:../architecture/architecture.adoc#architecture[OpenShift Container Platform architecture]. [id="migration-differences-architecture"] === Architecture differences @@ -36,14 +36,14 @@ For more information, see xref:../../architecture/architecture.adoc#architecture In {product-title} 4, control plane nodes must run {op-system}, ensuring that full-stack automation is maintained for the control plane. This makes rolling out updates and upgrades a much easier process than in {product-title} 3. -For more information, see xref:../../architecture/architecture-rhcos.adoc#architecture-rhcos[{op-system-first}]. +For more information, see xref:../architecture/architecture-rhcos.adoc#architecture-rhcos[{op-system-first}]. [discrete] ==== Operators Operators are a method of packaging, deploying, and managing a Kubernetes application. Operators ease the operational complexity of running another piece of software. They watch over your environment and use the current state to make decisions in real time. Advanced Operators are designed to upgrade and react to failures automatically. -For more information, see xref:../../operators/understanding/olm-what-operators-are.adoc#olm-what-operators-are[Understanding Operators]. +For more information, see xref:../operators/understanding/olm-what-operators-are.adoc#olm-what-operators-are[Understanding Operators]. [id="migration-differences-install"] === Installation and update differences @@ -55,10 +55,10 @@ To install {product-title} 3.11, you prepared your {op-system-base-full} hosts, In {product-title} {product-version}, you use the OpenShift installation program to create a minimum set of resources required for a cluster. Once the cluster is running, you use Operators to further configure your cluster and to install new services. After first boot, {op-system-first} systems are managed by the Machine Config Operator (MCO) that runs in the {product-title} cluster. -For more information, see xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process]. +For more information, see xref:../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process]. ifndef::openshift-origin[] -If you want to add {op-system-base-full} ({op-system-base}) worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster]. +If you want to add {op-system-base-full} ({op-system-base}) worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster]. endif::[] [discrete] @@ -66,14 +66,14 @@ endif::[] In {product-title} 3.11, you installed your cluster on infrastructure that you prepared and maintained. In addition to providing your own infrastructure, {product-title} 4 offers an option to deploy a cluster on infrastructure that the {product-title} installation program provisions and the cluster maintains. -For more information, see xref:../../architecture/architecture-installation.adoc#installation-overview_architecture-installation[OpenShift Container Platform installation overview]. +For more information, see xref:../architecture/architecture-installation.adoc#installation-overview_architecture-installation[OpenShift Container Platform installation overview]. [discrete] ==== Upgrading your cluster In {product-title} 3.11, you upgraded your cluster by running Ansible playbooks. In {product-title} {product-version}, the cluster manages its own updates, including updates to {op-system-first} on cluster nodes. You can easily upgrade your cluster by using the web console or by using the `oc adm upgrade` command from the OpenShift CLI and the Operators will automatically upgrade themselves. If your {product-title} {product-version} cluster has {op-system-base} worker machines, then you will still need to run an Ansible playbook to upgrade those worker machines. -For more information, see xref:../../updating/updating-cluster-between-minor.adoc#updating-cluster-between-minor[Updating clusters]. +For more information, see xref:../updating/updating-cluster-between-minor.adoc#updating-cluster-between-minor[Updating clusters]. [id="migration-considerations"] == Migration considerations @@ -90,21 +90,21 @@ Review the following storage changes to consider when transitioning from {produc Local storage is only supported by using the Local Storage Operator in {product-title} {product-version}. It is not supported to use the local provisioner method from {product-title} 3.11. -For more information, see xref:../../storage/persistent_storage/persistent-storage-local.adoc#persistent-storage-using-local-volume[Persistent storage using local volumes]. +For more information, see xref:../storage/persistent_storage/persistent-storage-local.adoc#persistent-storage-using-local-volume[Persistent storage using local volumes]. [discrete] ==== FlexVolume persistent storage The FlexVolume plug-in location changed from {product-title} 3.11. The new location in {product-title} {product-version} is `/etc/kubernetes/kubelet-plugins/volume/exec`. Attachable FlexVolume plug-ins are no longer supported. -For more information, see xref:../../storage/persistent_storage/persistent-storage-flexvolume.adoc#persistent-storage-using-flexvolume[Persistent storage using FlexVolume]. +For more information, see xref:../storage/persistent_storage/persistent-storage-flexvolume.adoc#persistent-storage-using-flexvolume[Persistent storage using FlexVolume]. [discrete] ==== Container Storage Interface (CSI) persistent storage Persistent storage using the Container Storage Interface (CSI) was link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] in {product-title} 3.11. CSI version 1.1.0 is fully supported in {product-title} {product-version}, but does not ship with any CSI drivers. You must install your own driver. -For more information, see xref:../../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-using-csi[Persistent storage using the Container Storage Interface (CSI)]. +For more information, see xref:../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-using-csi[Persistent storage using the Container Storage Interface (CSI)]. [discrete] ==== Red Hat OpenShift Container Storage @@ -113,7 +113,7 @@ Red Hat OpenShift Container Storage 3, which is available for use with {product- Red Hat OpenShift Container Storage 4, which is available for use with {product-title} 4, uses Red Hat Ceph Storage as the backing storage. -For more information, see xref:../../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-container-storage[Persistent storage using Red Hat OpenShift Container Storage] and the link:https://access.redhat.com/articles/4731161[interoperability matrix] article. +For more information, see xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-container-storage[Persistent storage using Red Hat OpenShift Container Storage] and the link:https://access.redhat.com/articles/4731161[interoperability matrix] article. [discrete] ==== Unsupported persistent storage options @@ -126,7 +126,7 @@ Support for the following persistent storage options from {product-title} 3.11 h If you used one of these in {product-title} 3.11, you must choose a different persistent storage option for full support in {product-title} {product-version}. -For more information, see xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage]. +For more information, see xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage]. [id="migration-preparing-networking"] === Networking considerations @@ -138,9 +138,9 @@ Review the following networking changes to consider when transitioning from {pro The default network isolation mode for {product-title} 3.11 was `ovs-subnet`, though users frequently switched to use `ovn-multitenant`. The default network isolation mode for {product-title} {product-version} is controlled by a network policy. -If your {product-title} 3.11 cluster used the `ovs-subnet` or `ovs-multitenant` mode, it is recommended to switch to a network policy for your {product-title} {product-version} cluster. Network policies are supported upstream, are more flexible, and they provide the functionality that `ovs-multitenant` does. If you want to maintain the `ovs-multitenant` behavior while using a network policy in {product-title} {product-version}, follow the steps to xref:../../networking/network_policy/multitenant-network-policy.adoc#multitenant-network-policy[configure multitenant isolation using network policy]. +If your {product-title} 3.11 cluster used the `ovs-subnet` or `ovs-multitenant` mode, it is recommended to switch to a network policy for your {product-title} {product-version} cluster. Network policies are supported upstream, are more flexible, and they provide the functionality that `ovs-multitenant` does. If you want to maintain the `ovs-multitenant` behavior while using a network policy in {product-title} {product-version}, follow the steps to xref:../networking/network_policy/multitenant-network-policy.adoc#multitenant-network-policy[configure multitenant isolation using network policy]. -For more information, see xref:../../networking/network_policy/about-network-policy.adoc#about-network-policy[About network policy]. +For more information, see xref:../networking/network_policy/about-network-policy.adoc#about-network-policy[About network policy]. [id="migration-preparing-logging"] === Logging considerations @@ -152,21 +152,21 @@ Review the following logging changes to consider when transitioning from {produc {product-title} 4 provides a simple deployment mechanism for OpenShift Logging, by using a Cluster Logging custom resource. -For more information, see xref:../../logging/cluster-logging-deploying.adoc#cluster-logging-deploying_cluster-logging-deploying[Installing OpenShift Logging]. +For more information, see xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploying_cluster-logging-deploying[Installing OpenShift Logging]. [discrete] ==== Aggregated logging data You cannot transition your aggregate logging data from {product-title} 3.11 into your new {product-title} 4 cluster. -For more information, see xref:../../logging/cluster-logging.adoc#cluster-logging-about_cluster-logging[About OpenShift Logging]. +For more information, see xref:../logging/cluster-logging.adoc#cluster-logging-about_cluster-logging[About OpenShift Logging]. [discrete] ==== Unsupported logging configurations Some logging configurations that were available in {product-title} 3.11 are no longer supported in {product-title} {product-version}. -For more information on the explicitly unsupported logging cases, see xref:../../logging/config/cluster-logging-maintenance-support.adoc#cluster-logging-maintenance-and-support[Maintenance and support]. +For more information on the explicitly unsupported logging cases, see xref:../logging/config/cluster-logging-maintenance-support.adoc#cluster-logging-maintenance-and-support[Maintenance and support]. [id="migration-preparing-security"] === Security considerations @@ -188,7 +188,7 @@ Configuration for identity providers has changed for {product-title} 4, includin * The request header identity provider in {product-title} {product-version} requires mutual TLS, where in {product-title} 3.11 it did not. * The configuration of the OpenID Connect identity provider was simplified in {product-title} {product-version}. It now obtains data, which previously had to specified in {product-title} 3.11, from the provider's `/.well-known/openid-configuration` endpoint. -For more information, see xref:../../authentication/understanding-identity-provider.adoc#understanding-identity-provider[Understanding identity provider configuration]. +For more information, see xref:../authentication/understanding-identity-provider.adoc#understanding-identity-provider[Understanding identity provider configuration]. [discrete] ==== OAuth token storage format @@ -205,4 +205,4 @@ Review the following monitoring changes to consider when transitioning from {pro The default alert that triggers to ensure the availability of the monitoring structure was called `DeadMansSwitch` in {product-title} 3.11. This was renamed to `Watchdog` in {product-title} 4. If you had PagerDuty integration set up with this alert in {product-title} 3.11, you must set up the PagerDuty integration for the `Watchdog` alert in {product-title} 4. -For more information, see xref:../../monitoring/managing-alerts.adoc#applying-custom-alertmanager-configuration_managing-alerts[Applying custom Alertmanager configuration]. +For more information, see xref:../monitoring/managing-alerts.adoc#applying-custom-alertmanager-configuration_managing-alerts[Applying custom Alertmanager configuration]. diff --git a/migration/migrating_3_4/troubleshooting-3-4.adoc b/migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc similarity index 81% rename from migration/migrating_3_4/troubleshooting-3-4.adoc rename to migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc index c65d46d7f6..f46e84789c 100644 --- a/migration/migrating_3_4/troubleshooting-3-4.adoc +++ b/migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc @@ -1,8 +1,7 @@ [id='troubleshooting-3-4'] = Troubleshooting include::modules/common-attributes.adoc[] -:context: migrating-3-4 -:migrating-3-4: +:context: troubleshooting-3-4 toc::[] @@ -38,7 +37,5 @@ include::modules/migration-known-issues.adoc[leveloffset=+1] [id="troubleshooting-additional-resources_{context}"] == Additional resources -* xref:../../migration/migrating_3_4/migrating-application-workloads-3-4.adoc#migration-mtc-workflow_migrating-3-4[{mtc-short} workflow] -* xref:../../migration/migrating_3_4/migrating-application-workloads-3-4.adoc#migration-mtc-custom-resources_migrating-3-4[{mtc-short} custom resources] - -:!migrating-3-4: +* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-mtc-workflow_about-mtc-3-4[{mtc-short} workflow] +* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-mtc-custom-resources_about-mtc-3-4[{mtc-short} custom resources] diff --git a/migration/migrating_3_4/configuring-replication-repository-3-4.adoc b/migration/migrating_3_4/configuring-replication-repository-3-4.adoc deleted file mode 100644 index 324bbf9cb5..0000000000 --- a/migration/migrating_3_4/configuring-replication-repository-3-4.adoc +++ /dev/null @@ -1,33 +0,0 @@ -[id='configuring-replication-repository'] -= Configuring object storage for a replication repository -include::modules/common-attributes.adoc[] -:context: migrating-3-4 -:migrating-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:../../migration/migrating_3_4/migrating-application-workloads-3-4.adoc#migration-understanding-data-copy-methods_migrating-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:../../migration/migrating_3_4/configuring-replication-repository-3-4.adoc#migration-configuring-mcg_migrating-3-4[Multi-Cloud Object Gateway (MCG)] -* xref:../../migration/migrating_3_4/configuring-replication-repository-3-4.adoc#migration-configuring-aws-s3_migrating-3-4[Amazon Web Services (AWS) S3] -* xref:../../migration/migrating_3_4/configuring-replication-repository-3-4.adoc#migration-configuring-gcp_migrating-3-4[Google Cloud Provider (GCP)] -* xref:../../migration/migrating_3_4/configuring-replication-repository-3-4.adoc#migration-configuring-azure_migrating-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] - -:!migrating-3-4: diff --git a/migration/migrating_3_4/images b/migration/migrating_3_4/images deleted file mode 120000 index 5fa6987088..0000000000 --- a/migration/migrating_3_4/images +++ /dev/null @@ -1 +0,0 @@ -../../images \ No newline at end of file diff --git a/migration/migrating_3_4/modules b/migration/migrating_3_4/modules deleted file mode 120000 index 8b0e854007..0000000000 --- a/migration/migrating_3_4/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules \ No newline at end of file diff --git a/modules/migration-about-migration-hooks.adoc b/modules/migration-about-migration-hooks.adoc index 844de9278d..ab722f1a27 100644 --- a/modules/migration-about-migration-hooks.adoc +++ b/modules/migration-about-migration-hooks.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/migrating-application-workloads-3-4.adoc +// +// * 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 diff --git a/modules/migration-adding-cluster-to-cam.adoc b/modules/migration-adding-cluster-to-cam.adoc index 63f628fc4a..d5391eb14b 100644 --- a/modules/migration-adding-cluster-to-cam.adoc +++ b/modules/migration-adding-cluster-to-cam.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-adding-replication-repository-to-cam.adoc b/modules/migration-adding-replication-repository-to-cam.adoc index 61cdd87cd2..7c97e54f24 100644 --- a/modules/migration-adding-replication-repository-to-cam.adoc +++ b/modules/migration-adding-replication-repository-to-cam.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-changing-migration-plan-limits.adoc b/modules/migration-changing-migration-plan-limits.adoc index 8abc246fbf..02a0beff17 100644 --- a/modules/migration-changing-migration-plan-limits.adoc +++ b/modules/migration-changing-migration-plan-limits.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-configuring-aws-s3.adoc b/modules/migration-configuring-aws-s3.adoc index 8c33bd8f47..ef34f009d0 100644 --- a/modules/migration-configuring-aws-s3.adoc +++ b/modules/migration-configuring-aws-s3.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/configuring-replication-repository-3-4.adoc +// * migrating_from_ocp_3_to_4/configuring-replication-repository-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 diff --git a/modules/migration-configuring-azure.adoc b/modules/migration-configuring-azure.adoc index 1db6e4ccc7..fb1d48df6b 100644 --- a/modules/migration-configuring-azure.adoc +++ b/modules/migration-configuring-azure.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/configuring-replication-repository-3-4.adoc +// * migrating_from_ocp_3_to_4/configuring-replication-repository-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 diff --git a/modules/migration-configuring-gcp.adoc b/modules/migration-configuring-gcp.adoc index 21dd5f0428..26355fb9a4 100644 --- a/modules/migration-configuring-gcp.adoc +++ b/modules/migration-configuring-gcp.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/configuring-replication-repository-3-4.adoc +// * migrating_from_ocp_3_to_4/configuring-replication-repository-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 diff --git a/modules/migration-configuring-mcg.adoc b/modules/migration-configuring-mcg.adoc index af24f48c4b..e88895b312 100644 --- a/modules/migration-configuring-mcg.adoc +++ b/modules/migration-configuring-mcg.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/configuring-replication-repository-3-4.adoc +// * migrating_from_ocp_3_to_4/configuring-replication-repository-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 diff --git a/modules/migration-configuring-proxy-for-dvm.adoc b/modules/migration-configuring-proxy-for-dvm.adoc index 159ebf4e47..56a7f1e46b 100644 --- a/modules/migration-configuring-proxy-for-dvm.adoc +++ b/modules/migration-configuring-proxy-for-dvm.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// +// * 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 diff --git a/modules/migration-creating-ca-bundle.adoc b/modules/migration-creating-ca-bundle.adoc index 091e31a34a..078d515abd 100644 --- a/modules/migration-creating-ca-bundle.adoc +++ b/modules/migration-creating-ca-bundle.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// +// * 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 diff --git a/modules/migration-creating-migration-plan-cam.adoc b/modules/migration-creating-migration-plan-cam.adoc index 2c5e8db059..0e2cc76256 100644 --- a/modules/migration-creating-migration-plan-cam.adoc +++ b/modules/migration-creating-migration-plan-cam.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-debugging-velero-resources.adoc b/modules/migration-debugging-velero-resources.adoc index fdb8d0737c..07ff497eef 100644 --- a/modules/migration-debugging-velero-resources.adoc +++ b/modules/migration-debugging-velero-resources.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// +// * 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 diff --git a/modules/migration-downloading-logs.adoc b/modules/migration-downloading-logs.adoc index 2ae67eaeac..e5c8e8b983 100644 --- a/modules/migration-downloading-logs.adoc +++ b/modules/migration-downloading-logs.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// * 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 diff --git a/modules/migration-dvm-error-node-selectors.adoc b/modules/migration-dvm-error-node-selectors.adoc index 21a2e04532..66abc4e815 100644 --- a/modules/migration-dvm-error-node-selectors.adoc +++ b/modules/migration-dvm-error-node-selectors.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// +// * 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 diff --git a/modules/migration-error-messages.adoc b/modules/migration-error-messages.adoc index d074000f1c..d4b9347202 100644 --- a/modules/migration-error-messages.adoc +++ b/modules/migration-error-messages.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// * 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 diff --git a/modules/migration-excluding-resources.adoc b/modules/migration-excluding-resources.adoc index e8892d2754..571c4c1cf3 100644 --- a/modules/migration-excluding-resources.adoc +++ b/modules/migration-excluding-resources.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// +// * 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 diff --git a/modules/migration-installing-mtc-on-ocp-3.adoc b/modules/migration-installing-mtc-on-ocp-3.adoc index 2139dbc9b6..4770a2c4d9 100644 --- a/modules/migration-installing-mtc-on-ocp-3.adoc +++ b/modules/migration-installing-mtc-on-ocp-3.adoc @@ -1,14 +1,16 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/deploying-cam-3-4.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 [id="migration-installing-mtc-on-ocp-3_{context}"] -ifdef::migrating-3-4[] +ifdef::installing-3-4[] = Installing the {mtc-full} on an {product-title} 3 source cluster You can install the {mtc-full} ({mtc-short}) manually on an {product-title} 3 source cluster. endif::[] -ifdef::disconnected-3-4[] +ifdef::installing-disconnected-3-4[] = Installing the {mtc-full} on an {product-title} 3 source cluster in a restricted environment You can create a manifest file based on the {mtc-full} ({mtc-short}) Operator image and edit the manifest to point to your local image registry. Then, you can use the local image to create the {mtc-full} Operator on an {product-title} 3 source cluster. @@ -27,22 +29,22 @@ To ensure that you have the latest version on the {product-title} 3 cluster, dow * You must have access to `registry.redhat.io`. * You must have `podman` installed. * The source cluster must be {product-title} 3.7, 3.9, 3.10, or 3.11. -ifdef::migrating-3-4[] +ifdef::installing-3-4[] * The source cluster must be configured to pull images from `registry.redhat.io`. + To pull images, you must link:https://access.redhat.com/solutions/3772061[create an image stream secret] and copy it to each node in your cluster. endif::[] -ifdef::disconnected-3-4[] +ifdef::installing-disconnected-3-4[] * You must have a Linux workstation with unrestricted network access. * You must have access to a mirror registry that supports link:https://docs.docker.com/registry/spec/manifest-v2-2/[Docker v2-2] endif::[] .Procedure -ifdef::migrating-3-4[] +ifdef::installing-3-4[] . Log in to `registry.redhat.io` with your Red Hat Customer Portal credentials: endif::[] -ifdef::disconnected-3-4[] +ifdef::installing-disconnected-3-4[] . On the workstation with unrestricted network access, log in to `registry.redhat.io` with your Red Hat Customer Portal credentials: endif::[] + @@ -67,7 +69,7 @@ $ sudo podman cp $(sudo podman create \ registry.redhat.io/rhmtc/openshift-migration-rhel7-operator:v{mtc-version}):/controller-3.yml ./ ---- -ifdef::disconnected-3-4[] +ifdef::installing-disconnected-3-4[] . Obtain the Operator image value from the `mapping.txt` file that was created when you ran the `oc adm catalog mirror` on the {product-title} 4 cluster: + [source,terminal,subs="attributes+"] @@ -105,7 +107,7 @@ endif::[] . Log in to your {product-title} 3 cluster. -ifdef::migrating-3-4[] +ifdef::installing-3-4[] . Verify that the cluster can authenticate with `registry.redhat.io`: + [source,terminal] diff --git a/modules/migration-installing-mtc-on-ocp-4.adoc b/modules/migration-installing-mtc-on-ocp-4.adoc index 9d25742c22..bf2c56e802 100644 --- a/modules/migration-installing-mtc-on-ocp-4.adoc +++ b/modules/migration-installing-mtc-on-ocp-4.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/deploying-cam-3-4.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 @@ -17,10 +17,10 @@ endif::[] ifdef::disconnected-source-4-2-4[] = Installing the {mtc-full} on an {product-title} 4.2 source cluster in a restricted environment endif::[] -ifdef::migrating-3-4,target-4-1-4,target-4-2-4[] +ifdef::installing-3-4,target-4-1-4,target-4-2-4[] = Installing the {mtc-full} on an {product-title} {product-version} target cluster endif::[] -ifdef::disconnected-3-4,disconnected-target-4-1-4,disconnected-target-4-2-4[] +ifdef::installing-disconnected-3-4,disconnected-target-4-1-4,disconnected-target-4-2-4[] = Installing the {mtc-full} on an {product-title} {product-version} target cluster in a restricted environment endif::[] @@ -28,21 +28,21 @@ ifdef::source-4-1-4,source-4-2-4,disconnected-source-4-1-4,disconnected-source-4 You can install the {mtc-full} ({mtc-short}) on an {product-title} 4 source cluster. endif::[] -ifdef::migrating-3-4,target-4-1-4,target-4-2-4,disconnected-3-4,disconnected-target-4-1-4,disconnected-target-4-2-4[] +ifdef::installing-3-4,target-4-1-4,target-4-2-4,installing-disconnected-3-4,disconnected-target-4-1-4,disconnected-target-4-2-4[] You can install the {mtc-full} ({mtc-short}) on an {product-title} {product-version} target cluster. endif::[] .Prerequisites * You must be logged in as a user with `cluster-admin` privileges on all clusters. -ifdef::disconnected-3-4,disconnected-target-4-1-4,disconnected-target-4-2-4,disconnected-source-4-1-4,disconnected-source-4-2-4[] +ifdef::installing-disconnected-3-4,disconnected-target-4-1-4,disconnected-target-4-2-4,disconnected-source-4-1-4,disconnected-source-4-2-4[] * You must create a custom Operator catalog and push it to a mirror registry. * You must configure Operator Lifecycle Manager to install the {mtc-full} Operator from the mirror registry. endif::[] .Procedure -ifdef::disconnected-3-4,disconnected-target-4-1-4,disconnected-source-4-2-4,disconnected-target-4-2-4,migrating-3-4,target-4-2-4,source-4-2-4,target-4-1-4[] +ifdef::installing-disconnected-3-4,disconnected-target-4-1-4,disconnected-source-4-2-4,disconnected-target-4-2-4,installing-3-4,target-4-2-4,source-4-2-4,target-4-1-4[] . In the {product-title} web console, click *Operators* -> *OperatorHub*. endif::[] ifdef::source-4-1-4[] diff --git a/modules/migration-known-issues.adoc b/modules/migration-known-issues.adoc index 7bc796c73a..539a7589b7 100644 --- a/modules/migration-known-issues.adoc +++ b/modules/migration-known-issues.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// * 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 diff --git a/modules/migration-launching-cam.adoc b/modules/migration-launching-cam.adoc index 0ecb1d3efd..f6bb967c7e 100644 --- a/modules/migration-launching-cam.adoc +++ b/modules/migration-launching-cam.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-migrating-applications-api.adoc b/modules/migration-migrating-applications-api.adoc index 73cd9a9d82..2528aec44a 100644 --- a/modules/migration-migrating-applications-api.adoc +++ b/modules/migration-migrating-applications-api.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-mtc-cr-manifests.adoc b/modules/migration-mtc-cr-manifests.adoc index 6fd7d69c1c..ab0740f7ef 100644 --- a/modules/migration-mtc-cr-manifests.adoc +++ b/modules/migration-mtc-cr-manifests.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-mtc-custom-resources.adoc b/modules/migration-mtc-custom-resources.adoc index 085108f5dd..2749e34a03 100644 --- a/modules/migration-mtc-custom-resources.adoc +++ b/modules/migration-mtc-custom-resources.adoc @@ -1,5 +1,6 @@ +// Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-application-workloads-3-4.adoc +// * 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 diff --git a/modules/migration-mtc-workflow.adoc b/modules/migration-mtc-workflow.adoc index 2c92f58ab2..71f3a7ad71 100644 --- a/modules/migration-mtc-workflow.adoc +++ b/modules/migration-mtc-workflow.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-application-workloads-3-4.adoc +// * 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 diff --git a/modules/migration-partial-failure-velero.adoc b/modules/migration-partial-failure-velero.adoc index ed0374b7ba..07b54375a4 100644 --- a/modules/migration-partial-failure-velero.adoc +++ b/modules/migration-partial-failure-velero.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// +// * 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 diff --git a/modules/migration-prerequisites.adoc b/modules/migration-prerequisites.adoc index ef6221b2ad..2f2a3a4d32 100644 --- a/modules/migration-prerequisites.adoc +++ b/modules/migration-prerequisites.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// +// * 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 diff --git a/modules/migration-rolling-back-migration-cli.adoc b/modules/migration-rolling-back-migration-cli.adoc index 397fbef731..0c704773d5 100644 --- a/modules/migration-rolling-back-migration-cli.adoc +++ b/modules/migration-rolling-back-migration-cli.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// +// * 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 diff --git a/modules/migration-rolling-back-migration-web-console.adoc b/modules/migration-rolling-back-migration-web-console.adoc index c5e1ae9d8e..4c95eab522 100644 --- a/modules/migration-rolling-back-migration-web-console.adoc +++ b/modules/migration-rolling-back-migration-web-console.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// +// * 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 diff --git a/modules/migration-running-migration-plan-cam.adoc b/modules/migration-running-migration-plan-cam.adoc index 51e12f5da2..195a66d1f7 100644 --- a/modules/migration-running-migration-plan-cam.adoc +++ b/modules/migration-running-migration-plan-cam.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * 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 diff --git a/modules/migration-understanding-data-copy-methods.adoc b/modules/migration-understanding-data-copy-methods.adoc index 54dff65e91..7cf435944e 100644 --- a/modules/migration-understanding-data-copy-methods.adoc +++ b/modules/migration-understanding-data-copy-methods.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-application-workloads-3-4.adoc +// * 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 diff --git a/modules/migration-updating-deprecated-gvks.adoc b/modules/migration-updating-deprecated-gvks.adoc index fcc386673f..bf71ade81c 100644 --- a/modules/migration-updating-deprecated-gvks.adoc +++ b/modules/migration-updating-deprecated-gvks.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/troubleshooting-3-4.adoc -// for CAM 1.2/4.4 only +// +// * migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc [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 19f06d82b5..3264870866 100644 --- a/modules/migration-updating-deprecated-internal-images.adoc +++ b/modules/migration-updating-deprecated-internal-images.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// * migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc [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 b43db38703..18a204de8e 100644 --- a/modules/migration-upgrading-from-mtc-1-3.adoc +++ b/modules/migration-upgrading-from-mtc-1-3.adoc @@ -1,7 +1,8 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/deploying-cam-3-4.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-tool-4-2-4.adoc +// * migration/migrating_4_1_4/deploying-cam-4-2-4.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 2cd5f89d95..6cd18446a3 100644 --- a/modules/migration-upgrading-mtc-on-ocp-3.adoc +++ b/modules/migration-upgrading-mtc-on-ocp-3.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/deploying-cam-3-4.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_1_4/deploying-cam-4-2-4.adoc [id='migration-upgrading-mtc-on-ocp-3_{context}'] = Upgrading the {mtc-full} on an {product-title} 3 cluster diff --git a/modules/migration-upgrading-mtc-on-ocp-4.adoc b/modules/migration-upgrading-mtc-on-ocp-4.adoc index 49c71c750d..bf71b4ada8 100644 --- a/modules/migration-upgrading-mtc-on-ocp-4.adoc +++ b/modules/migration-upgrading-mtc-on-ocp-4.adoc @@ -1,7 +1,8 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/deploying-cam-3-4.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 +// * migration/migrating_4_1_4/deploying-cam-4-2-4.adoc [id='migration-upgrading-mtc-on-ocp-4_{context}'] = Upgrading the {mtc-full} on an {product-title} 4 cluster diff --git a/modules/migration-using-mig-log-reader.adoc b/modules/migration-using-mig-log-reader.adoc index cf67d6ef55..fa48279152 100644 --- a/modules/migration-using-mig-log-reader.adoc +++ b/modules/migration-using-mig-log-reader.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// * 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 diff --git a/modules/migration-using-must-gather.adoc b/modules/migration-using-must-gather.adoc index 96db2f2555..c7ce4b9be4 100644 --- a/modules/migration-using-must-gather.adoc +++ b/modules/migration-using-must-gather.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// * 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 diff --git a/modules/migration-viewing-migration-crs.adoc b/modules/migration-viewing-migration-crs.adoc index 792459074c..6f0241e3c0 100644 --- a/modules/migration-viewing-migration-crs.adoc +++ b/modules/migration-viewing-migration-crs.adoc @@ -1,8 +1,9 @@ // Module included in the following assemblies: // -// * migration/migrating_3_4/troubleshooting-3-4.adoc +// * 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 + [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 44a6661c48..84ad677201 100644 --- a/modules/migration-writing-ansible-playbook-hook.adoc +++ b/modules/migration-writing-ansible-playbook-hook.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc +// +// * 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 diff --git a/modules/olm-creating-catalog-from-index.adoc b/modules/olm-creating-catalog-from-index.adoc index 51d50fc02b..dff8bc60b2 100644 --- a/modules/olm-creating-catalog-from-index.adoc +++ b/modules/olm-creating-catalog-from-index.adoc @@ -2,7 +2,7 @@ // // * operators/admin/olm-restricted-networks.adoc // * operators/admin/managing-custom-catalogs.adoc -// * migration/migrating_3_4/deploying-cam-3-4.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 diff --git a/modules/olm-mirroring-catalog.adoc b/modules/olm-mirroring-catalog.adoc index dd109fcb49..3095bdd8c5 100644 --- a/modules/olm-mirroring-catalog.adoc +++ b/modules/olm-mirroring-catalog.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * operators/admin/olm-restricted-networks.adoc -// * migration/migrating_3_4/deploying-cam-3-4.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 diff --git a/modules/olm-pruning-index-image.adoc b/modules/olm-pruning-index-image.adoc index e1f52171c7..9afdadd841 100644 --- a/modules/olm-pruning-index-image.adoc +++ b/modules/olm-pruning-index-image.adoc @@ -2,7 +2,7 @@ // // * operators/admin/olm-restricted-networks.adoc // * operators/admin/olm-managing-custom-catalogs.adoc -// * migration/migrating_3_4/deploying-cam-3-4.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 diff --git a/modules/olm-restricted-networks-configuring-operatorhub.adoc b/modules/olm-restricted-networks-configuring-operatorhub.adoc index 547efee24d..89ad43e4b8 100644 --- a/modules/olm-restricted-networks-configuring-operatorhub.adoc +++ b/modules/olm-restricted-networks-configuring-operatorhub.adoc @@ -2,7 +2,7 @@ // // * operators/admin/olm-restricted-networks.adoc // * operators/admin/olm-managing-custom-catalogs.adoc -// * migration/migrating_3_4/deploying-cam-3-4.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