diff --git a/migration/migrating-3-4/deploying_cam.adoc b/migration/migrating-3-4/deploying_cam.adoc index 19b482e77b..b60ace3857 100644 --- a/migration/migrating-3-4/deploying_cam.adoc +++ b/migration/migrating-3-4/deploying_cam.adoc @@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[] toc::[] -Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-3-4/deploying_cam.adoc#installing-cam-operator-ocp-3_sourcecluster-3-4[{product-title} 3 source] and xref:../../migration/migrating-3-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-3-4[{product-title} {product-version} target] clusters and configuring cross-origin resource sharing on the xref:../../migration/migrating-3-4/deploying_cam.adoc#migration-configuring-cors-3_sourcecluster-3-4[{product-title} 3 source cluster]. +Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-3-4/deploying_cam.adoc#installing-cam-operator-ocp-3_sourcecluster-3-4[{product-title} 3 source] and xref:../../migration/migrating-3-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-3-4[{product-title} {product-version} target] clusters. :context: sourcecluster-3-4 :sourcecluster-3-4: @@ -17,8 +17,3 @@ include::modules/migration-installing-cam-operator-ocp-3.adoc[leveloffset=+1] :targetcluster-3-4: include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-3-4!: - -:context: sourcecluster-3-4 -:sourcecluster-3-4: -include::modules/migration-configuring-cors-3.adoc[leveloffset=+1] -:sourcecluster-3-4!: diff --git a/migration/migrating-4_1-4/deploying_cam.adoc b/migration/migrating-4_1-4/deploying_cam.adoc index ef246d9ebf..c77797bc48 100644 --- a/migration/migrating-4_1-4/deploying_cam.adoc +++ b/migration/migrating-4_1-4/deploying_cam.adoc @@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[] toc::[] -Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-4_1-4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_1-4_x[{product-title} 4.1 source] and xref:../../migration/migrating-4_1-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_1-4_x[{product-title} {product-version} target] clusters and configuring cross-origin resource sharing on the xref:../../migration/migrating-4_1-4/deploying_cam.adoc#migration-configuring-cors-4_sourcecluster-4_1-4_x[{product-title} 4.1 source cluster]. +Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-4_1-4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_1-4_x[{product-title} 4.1 source] and xref:../../migration/migrating-4_1-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_1-4_x[{product-title} {product-version} target] clusters. :context: sourcecluster-4_1-4_x :sourcecluster-4_1-4_x: @@ -17,8 +17,3 @@ include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-4_1-4_x: include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-4_1-4_x!: - -:context: sourcecluster-4_1-4_x -:sourcecluster-4_1-4_x: -include::modules/migration-configuring-cors-4.adoc[leveloffset=+1] -:sourcecluster-4_1-4_x!: diff --git a/migration/migrating-4_2-4/deploying_cam.adoc b/migration/migrating-4_2-4/deploying_cam.adoc index 6b0ce6ebc6..372b9ace5f 100644 --- a/migration/migrating-4_2-4/deploying_cam.adoc +++ b/migration/migrating-4_2-4/deploying_cam.adoc @@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[] toc::[] -Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-4_2-4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_2-4_x[{product-title} 4.2 source] and xref:../../migration/migrating-4_2-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_2-4_x[{product-title} {product-version} target] clusters and configuring cross-origin resource sharing on the xref:../../migration/migrating-4_2-4/deploying_cam.adoc#migration-configuring-cors-4_sourcecluster-4_2-4_x[{product-title} 4.2 source cluster]. +Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-4_2-4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_2-4_x[{product-title} 4.2 source] and xref:../../migration/migrating-4_2-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_2-4_x[{product-title} {product-version} target] clusters. :context: sourcecluster-4_2-4_x :sourcecluster-4_2-4_x: @@ -17,8 +17,3 @@ include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-4_2-4_x: include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-4_2-4_x!: - -:context: sourcecluster-4_2-4_x -:sourcecluster-4_2-4_x: -include::modules/migration-configuring-cors-4.adoc[leveloffset=+1] -:sourcecluster-4_2-4_x!: diff --git a/modules/migration-adding-cluster-to-cam.adoc b/modules/migration-adding-cluster-to-cam.adoc index 8bd0240216..ac4b4e05a9 100644 --- a/modules/migration-adding-cluster-to-cam.adoc +++ b/modules/migration-adding-cluster-to-cam.adoc @@ -8,12 +8,11 @@ You can add a source cluster to the CAM web console. -.Prerequisites +.Prerequisites for Azure -* Cross-origin resource sharing must be configured on the source cluster. -* If you are using Azure snapshots to copy data: -** You must provide the Azure resource group name when you add the source cluster. -** The source and target clusters must be in the same Azure resource group and in the same location. +If you are using Azure snapshots to copy data: +* You must provide the Azure resource group name when you add the source cluster. +* The source and target clusters must be in the same Azure resource group and in the same location. .Procedure diff --git a/modules/migration-configuring-cors-3.adoc b/modules/migration-configuring-cors-3.adoc deleted file mode 100644 index 562a89a4e0..0000000000 --- a/modules/migration-configuring-cors-3.adoc +++ /dev/null @@ -1,66 +0,0 @@ -// Module included in the following assemblies: -// -// migration/migrating-3-4/deploying_cam.adoc -[id='migration-configuring-cors-3_{context}'] -= Configuring cross-origin resource sharing on an {product-title} 3 source cluster - -You must configure cross-origin resource sharing on an {product-title} 3 source cluster to enable communication between the source cluster's API server and the CAM tool. - -.Procedure - -. Log in to the cluster on which the CAM tool is installed. -. Obtain the value for your CORS configuration: -+ ----- -$ oc get -n openshift-migration route/migration -o go-template='(?i)//{{ .spec.host }}(:|\z){{ println }}' | sed 's,\.,\\.,g' ----- - -. Log in to the {product-title} 3 source cluster. -. Add the CORS configuration value to the `corsAllowedOrigins` stanza in the `/etc/origin/master/master-config.yaml` configuration file: -+ ----- -corsAllowedOrigins: -- (?i)//migration-openshift-migration\.apps\.cluster\.com(:|\z) <1> -- (?i)//openshift\.default\.svc(:|\z) -- (?i)//kubernetes\.default(:|\z) ----- -<1> Specify your CORS configuration. - -. Restart the API server and controller manager to apply the changes: -+ -* In {product-title} 3.7 and 3.9, these components run as stand-alone host processes managed by `systemd` and are restarted by running the following command: -+ ----- -$ systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers ----- - -* In {product-title} 3.10 and 3.11, these components run in static Pods managed by a kubelet and are restarted by running the following commands: -+ ----- -$ /usr/local/bin/master-restart api -$ /usr/local/bin/master-restart controllers ----- - -. Verify the configuration: -+ ----- -$ curl -v -k -X OPTIONS \ -"/apis/migration.openshift.io/v1alpha1/namespaces/openshift-migration/migclusters" \ <1> --H "Access-Control-Request-Method: GET" \ --H "Access-Control-Request-Headers: authorization" \ --H "Origin: https://" <2> ----- -<1> Specify the URL of your CORS configured cluster. -<2> Specify the URL of your CAM web console. The URL is based on the CORS configuration value, for example, `\https://migration-openshift-migration.apps.cluster`. -+ -The output appears similar to the following: -+ ----- -< HTTP/2 204 -< access-control-allow-credentials: true -< access-control-allow-headers: Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, X-Requested-With, If-Modified-Since -< access-control-allow-methods: POST, GET, OPTIONS, PUT, DELETE, PATCH -< access-control-allow-origin: https://migration-openshift-migration.apps.cluster -< access-control-expose-headers: Date -< cache-control: no-store ----- diff --git a/modules/migration-configuring-cors-4.adoc b/modules/migration-configuring-cors-4.adoc deleted file mode 100644 index 950a84f04e..0000000000 --- a/modules/migration-configuring-cors-4.adoc +++ /dev/null @@ -1,110 +0,0 @@ -// Module included in the following assemblies: -// -// migration/migrating-3-4/deploying_cam.adoc -// migration/migrating-4_1-4/deploying_cam.adoc -// migration/migrating-4_2-4/deploying_cam.adoc -[id='migration-configuring-cors-4_{context}'] -ifdef::sourcecluster-4_1-4_x[] -= Configuring cross-origin resource sharing on an {product-title} 4.1 source cluster - -You must configure cross-origin resource sharing on an {product-title} 4.1 source cluster to enable communication between the source cluster's API server and the CAM tool. -endif::[] -ifdef::sourcecluster-4_2-4_x[] -= Configuring cross-origin resource sharing on an {product-title} 4.2 source cluster - -You must configure cross-origin resource sharing on an {product-title} 4.2 source cluster to enable communication between the source cluster's API server and the CAM tool. -endif::[] - -.Procedure - -. Log in to the cluster on which the CAM tool is installed. -. Obtain the value for your CORS configuration: -+ ----- -$ oc get -n openshift-migration route/migration -o go-template='(?i)//{{ .spec.host }}(:|\z){{ println }}' | sed 's,\.,\\.,g' ----- - -. Log in to the source cluster. -ifdef::sourcecluster-4_1-4_x[] -. Edit the OAuth server CR: -+ ----- -$ oc edit authentication.operator cluster ----- - -. Add the CORS configuration value to `corsAllowedOrigins` under `unsupportedConfigOverrides` in the `spec` stanza: -+ -[source,yaml] ----- -spec: - unsupportedConfigOverrides: - corsAllowedOrigins: - - (?i)//migration-openshift-migration\.apps\.cluster\.com(:|\z) <1> ----- -<1> Specify your CORS configuration value. - -. Save the file to apply the changes. -endif::[] - -. Edit the Kubernetes API server CR: -+ -ifdef::sourcecluster-4_1-4_x[] ----- -$ oc edit kubeapiserver.operator cluster ----- -endif::[] -ifdef::sourcecluster-4_2-4_x[] ----- -$ oc edit apiserver.config.openshift.io cluster ----- -endif::[] - -ifdef::sourcecluster-4_1-4_x[] -. Add the CORS configuration value to `corsAllowedOrigins` under `unsupportedConfigOverrides` in the `spec` stanza: -+ -[source,yaml] ----- -spec: - unsupportedConfigOverrides: - corsAllowedOrigins: - - (?i)//migration-openshift-migration\.apps\.cluster\.com(:|\z) <1> ----- -<1> Specify your CORS configuration value. -endif::[] -ifdef::sourcecluster-4_2-4_x[] -. Add the CORS configuration value to `additionalCORSAllowedOrigins` in the `spec` stanza: -+ -[source,yaml] ----- -spec: - additionalCORSAllowedOrigins: - - (?i)//migration-openshift-migration\.apps\.cluster\.com(:|\z) <1> ----- -<1> Specify your CORS configuration value. -endif::[] - -. Save the file to apply the changes. - -. Verify the configuration: -+ ----- -$ curl -v -k -X OPTIONS \ -"/apis/migration.openshift.io/v1alpha1/namespaces/openshift-migration/migclusters" \ <1> --H "Access-Control-Request-Method: GET" \ --H "Access-Control-Request-Headers: authorization" \ --H "Origin: https://" <2> ----- -<1> Specify the URL of your CORS configured cluster. -<2> Specify the URL of your CAM web console. The URL is based on the CORS configuration value, for example, `\https://migration-openshift-migration.apps.cluster`. -+ -The output appears similar to the following: -+ ----- -< HTTP/2 204 -< access-control-allow-credentials: true -< access-control-allow-headers: Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, X-Requested-With, If-Modified-Since -< access-control-allow-methods: POST, GET, OPTIONS, PUT, DELETE, PATCH -< access-control-allow-origin: https://migration-openshift-migration.apps.cluster -< access-control-expose-headers: Date -< cache-control: no-store ----- diff --git a/modules/migration-launching-cam.adoc b/modules/migration-launching-cam.adoc index a82bce14c7..f0ec09f7b7 100644 --- a/modules/migration-launching-cam.adoc +++ b/modules/migration-launching-cam.adoc @@ -21,7 +21,7 @@ $ oc get -n openshift-migration route/migration -o go-template='(?i}//{{ .spec.h + [NOTE] ==== -If you try to access the CAM web console immediately after installing the CAM Operator, the console may not load because the Operator is still configuring the cluster and enabling cross-origin resource sharing. Wait a few minutes and retry. +If you try to access the CAM web console immediately after installing the CAM Operator, the console may not load because the Operator is still configuring the cluster. Wait a few minutes and retry. ==== . If you are using self-signed CA certificates, you will be prompted to accept the CA certificate of the source cluster's API server. The web page will guide you through the process of accepting the remaining certificates. diff --git a/modules/migration-understanding-cam.adoc b/modules/migration-understanding-cam.adoc index e1ae9203c5..b02dc70f68 100644 --- a/modules/migration-understanding-cam.adoc +++ b/modules/migration-understanding-cam.adoc @@ -6,7 +6,7 @@ [id='migration-understanding-cam_{context}'] = Understanding the Cluster Application Migration tool -The Cluster Application Migration (CAM) tool enables you to migrate Kubernetes resources, persistent volume data, and internal container images from an {product-title} source cluster to an {product-title} target cluster, using the CAM web console or the Kubernetes API. +The Cluster Application Migration (CAM) tool enables you to migrate Kubernetes resources, persistent volume data, and internal container images from an {product-title} source cluster to an {product-title} {product-version} target cluster, using the CAM web console or the Kubernetes API. Migrating an application with the CAM web console involves the following steps: @@ -15,11 +15,8 @@ Migrating an application with the CAM web console involves the following steps: [NOTE] ==== The CAM Operator installs the CAM tool (CAM web console and Migration controller) on the target cluster by default. You can change this configuration in order to install the CAM tool on another cluster. - -If the CAM tool is not installed on the target cluster, you must configure cross-origin resource sharing on the target cluster and add the target cluster to the CAM web console. ==== -. Configuring cross-origin resource sharing on the source cluster, to enable communication between the cluster's API server and the CAM tool . Configuring the replication repository, an intermediate object storage that the CAM tool uses to migrate data . Adding the source cluster to the CAM web console . Adding the replication repository to the CAM web console