Merge pull request #65327 from amolnar-rh/TELCODOCS-1315

TELCODOCS-1315: Correct PGT/CGU for platform update

Author: abhatt-rh

modules/cnf-topology-aware-lifecycle-manager-platform-update.adoc

@@ -54,15 +54,6 @@ spec:
             - quay-intern.example.com/ocp4/openshift-release-dev
             source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     - fileName: ClusterVersion.yaml <4>
-      policyName: "platform-upgrade-prep"
-      metadata:
-        name: version
-        annotations:
-          ran.openshift.io/ztp-deploy-wave: "1"
-      spec:
-        channel: "stable-{product-version}"
-        upstream: http://upgrade.example.com/images/upgrade-graph_stable-{product-version}
-    - fileName: ClusterVersion.yaml <5>
       policyName: "platform-upgrade"
       metadata:
         name: version
@@ -77,10 +68,9 @@ spec:
             state: "Completed"
 ----
 <1> The `ConfigMap` CR contains the signature of the desired release image to update to.
-<2> Shows the image signature of the desired {product-title} release. Get the signature from the `checksum-${OCP_RELASE_NUMBER}.yaml` file you saved when following the procedures in the "Setting up the environment" section.
+<2> Shows the image signature of the desired {product-title} release. Get the signature from the `checksum-${OCP_RELEASE_NUMBER}.yaml` file you saved when following the procedures in the "Setting up the environment" section.
 <3> Shows the mirror repository that contains the desired {product-title} image. Get the mirrors from the `imageContentSources.yaml` file that you saved when following the procedures in the "Setting up the environment" section.
-<4> Shows the `ClusterVersion` CR to update upstream.
-<5> Shows the `ClusterVersion` CR to trigger the update. The `channel`, `upstream`, and `desiredVersion` fields are all required for image pre-caching.
+<4> Shows the `ClusterVersion` CR to trigger the update. The `channel`, `upstream`, and `desiredVersion` fields are all required for image pre-caching.
 +
 The `PolicyGenTemplate` CR generates two policies:
 
@@ -99,44 +89,9 @@ ArgoCD pulls the changes from the Git repository and generates the policies on t
 $ oc get policies -A | grep platform-upgrade
 ----
 
-. Apply the required update resources before starting the platform update with the {cgu-operator}.
-
-.. Save the content of the `platform-upgrade-prep` `ClusterUpgradeGroup` CR with the `du-upgrade-platform-upgrade-prep` policy and the target managed clusters to the `cgu-platform-upgrade-prep.yml` file, as shown in the following example:
-+
-[source,yaml]
-----
-apiVersion: ran.openshift.io/v1alpha1
-kind: ClusterGroupUpgrade
-metadata:
-  name: cgu-platform-upgrade-prep
-  namespace: default
-spec:
-  managedPolicies:
-  - du-upgrade-platform-upgrade-prep
-  clusters:
-  - spoke1
-  remediationStrategy:
-    maxConcurrency: 1
-  enable: true
-----
-
-.. Apply the policy to the hub cluster by running the following command:
-+
-[source,terminal]
-----
-$ oc apply -f cgu-platform-upgrade-prep.yml
-----
-
-.. Monitor the update process. Upon completion, ensure that the policy is compliant by running the following command:
-+
-[source,terminal]
-----
-$ oc get policies --all-namespaces
-----
-
 . Create the `ClusterGroupUpdate` CR for the platform update with the `spec.enable` field set to `false`.
 
-.. Save the content of the platform update `ClusterGroupUpdate` CR with the `du-upgrade-platform-upgrade` policy and the target clusters to the `cgu-platform-upgrade.yml` file, as shown in the following example:
+.. Save the content of the platform update `ClusterGroupUpdate` CR with the `du-upgrade-platform-upgrade-prep` and the `du-upgrade-platform-upgrade` policies and the target clusters to the `cgu-platform-upgrade.yml` file, as shown in the following example:
 +
 [source,yaml]
 ----
@@ -147,6 +102,7 @@ metadata:
   namespace: default
 spec:
   managedPolicies:
+  - du-upgrade-platform-upgrade-prep
   - du-upgrade-platform-upgrade
   preCaching: false
   clusters: