Merge pull request #64967 from danielclowers/CNV-24705

jldohmann · web-flow · commit 96b1fe5067c8 · 2023-10-20T12:05:46.000-05:00
[enterprise-4.14] CNV-24705: Update TTO and SSP downstream sections
diff --git a/modules/virt-about-ssp-operator.adoc b/modules/virt-about-ssp-operator.adoc
@@ -1,12 +1,12 @@
 // Module included in the following assemblies:
 //
-// * virt/virt-architecture.adoc
+// * virt/about_virt/virt-architecture.adoc
 
 :_content-type: CONCEPT
 [id="virt-about-ssp-operator_{context}"]
 = About the Scheduling, Scale, and Performance (SSP) Operator
 
-The SSP Operator, `ssp-operator`, deploys the common templates, the related default boot sources, and the template validator.
+The SSP Operator, `ssp-operator`, deploys the common templates, the related default boot sources, the pipeline tasks, and the template validator.
 
 image::cnv_components_ssp-operator.png[ssp-operator components]
 
diff --git a/modules/virt-about-tekton-tasks-operator.adoc b/modules/virt-about-tekton-tasks-operator.adoc
@@ -8,7 +8,7 @@
 
 The Tekton Tasks Operator, `tekton-tasks-operator`, deploys example pipelines showing the usage of OpenShift Pipelines for virtual machines (VMs). This operator also deploys additional OpenShift Pipeline tasks that allow users to create VMs from templates, copy and modify templates, and create data volumes.
 
-image::cnv_components_tekton-tasks-operator.png[tekton-tasks-operator components]
+//image::cnv_components_tekton-tasks-operator.png[tekton-tasks-operator components]
 
 .Tekton Tasks Operator components
 [cols="1,1"]
diff --git a/modules/virt-deploying-ssp.adoc b/modules/virt-deploying-ssp.adoc
@@ -3,10 +3,10 @@
 // * virt/virtual_machines/virt-managing-vms-openshift-pipelines.adoc
 
 :_content-type: PROCEDURE
-[id="virt-deploying-tto_{context}"]
-= Deploying the Tekton Tasks Operator resources
+[id="virt-deploying-ssp_{context}"]
+= Deploying the Scheduling, Scale, and Performance (SSP) resources
 
-The Tekton Tasks Operator (TTO) tasks and example pipelines are not deployed by default when you install {VirtProductName}. To deploy TTO resources, enable the `deployTektonTaskResources` feature gate in the `HyperConverged` custom resource (CR).
+The SSP Operator example Tekton Tasks and Pipelines are not deployed by default when you install {VirtProductName}. To deploy the SSP Operator's Tekton resources, enable the `deployTektonTaskResources` feature gate in the `HyperConverged` custom resource (CR).
 
 .Procedure
 
@@ -33,7 +33,7 @@ spec:
 # ...
 ----
 <1> The namespace where the pipelines are to be run.
-<2> The feature gate to be enabled to deploy TTO resources.
+<2> The feature gate to be enabled to deploy Tekton resources by SSP operator.
 +
 [NOTE]
 ====
diff --git a/modules/virt-running-ssp-pipeline-cli.adoc b/modules/virt-running-ssp-pipeline-cli.adoc
diff --git a/modules/virt-running-ssp-pipeline-web.adoc b/modules/virt-running-ssp-pipeline-web.adoc
diff --git a/modules/virt-supported-ssp-tasks.adoc b/modules/virt-supported-ssp-tasks.adoc
@@ -3,16 +3,19 @@
 // * virt/virtual_machines/virt-managing-vms-openshift-pipelines.adoc
 
 :_content-type: REFERENCE
-[id="virt-supported-tekton-tasks_{context}"]
-= Virtual machine tasks supported by the Tekton Tasks Operator
+[id="virt-supported-ssp-tasks_{context}"]
+= Virtual machine tasks supported by the SSP Operator
 
-The following table shows the tasks that are included as part of the Tekton Tasks Operator.
+The following table shows the tasks that are included as part of the SSP Operator.
 
-.Virtual machine tasks supported by the Tekton Tasks Operator
+.Virtual machine tasks supported by the SSP Operator
 [cols="1,1",options="header"]
 |===
 | Task | Description
 
+| `create-vm-from-manifest`
+| Create a virtual machine from a provided manifest or with `virtctl`.
+
 | `create-vm-from-template`
 | Create a virtual machine from a template.
 
@@ -37,3 +40,8 @@ The following table shows the tasks that are included as part of the Tekton Task
 | `wait-for-vmi-status`
 | Wait for a specific status of a virtual machine instance and fail or succeed based on the status.
 |===
+
+[NOTE]
+====
+Virtual machine creation in pipelines now utilizes `ClusterInstanceType` and `ClusterPreference` instead of template-based tasks, which have been deprecated. The `create-vm-from-template`, `copy-template`, and `modify-vm-template` commands remain available but are not used in default pipeline tasks.
+====
diff --git a/virt/about_virt/virt-architecture.adoc b/virt/about_virt/virt-architecture.adoc
@@ -36,6 +36,4 @@ include::modules/virt-about-hpp-operator.adoc[leveloffset=+1]
 
 include::modules/virt-about-ssp-operator.adoc[leveloffset=+1]
 
-include::modules/virt-about-tekton-tasks-operator.adoc[leveloffset=+1]
-
 include::modules/virt-about-virt-operator.adoc[leveloffset=+1]
diff --git a/virt/virtual_machines/virt-managing-vms-openshift-pipelines.adoc b/virt/virtual_machines/virt-managing-vms-openshift-pipelines.adoc
@@ -8,7 +8,7 @@ toc::[]
 
 link:https://docs.openshift.com/pipelines/latest/about/understanding-openshift-pipelines.html[{pipelines-title}] is a Kubernetes-native CI/CD framework that allows developers to design and run each step of the CI/CD pipeline in its own container.
 
-The Tekton Tasks Operator (TTO) integrates {VirtProductName} with {pipelines-shortname}. TTO includes tasks and example pipelines that allow you to:
+The Scheduling, Scale, and Performance (SSP) Operator integrates {VirtProductName} with {pipelines-shortname}. The SSP Operator includes tasks and example pipelines that allow you to:
 
 * Create and manage virtual machines (VMs), persistent volume claims (PVCs), and data volumes
 * Run commands in VMs
@@ -26,15 +26,15 @@ include::snippets/technology-preview.adoc[]
 * You have link:https://docs.openshift.com/pipelines/latest/install_config/installing-pipelines.html[installed {pipelines-shortname}].
 
 
-include::modules/virt-deploying-tto.adoc[leveloffset=+1]
+include::modules/virt-deploying-ssp.adoc[leveloffset=+1]
 
-include::modules/virt-supported-tekton-tasks.adoc[leveloffset=+1]
+include::modules/virt-supported-ssp-tasks.adoc[leveloffset=+1]
 
 
 [id="example-pipelines_virt-managing-vms-openshift-pipelines"]
 == Example pipelines
 
-The Tekton Tasks Operator includes the following example `Pipeline` manifests. You can run the example pipelines by using the web console or CLI.
+The SSP Operator includes the following example `Pipeline` manifests. You can run the example pipelines by using the web console or CLI.
 
 You might have to run more than one installer pipeline if you need multiple versions of Windows. If you run more than one installer pipeline, each one requires unique parameters, such as the `autounattend` config map and base image name. For example, if you need Windows 10 and Windows 11 or Windows Server 2022 images, you have to run both the Windows efi installer pipeline and the Windows bios installer pipeline. However, if you need Windows 11 and Windows Server 2022 images, you have to run only the Windows efi installer pipeline.
 
@@ -46,12 +46,12 @@ Windows customize pipeline:: This pipeline clones the data volume of a basic Win
 
 [NOTE]
 ====
-The `tekton-tasks-operator` example pipelines use a config map file with `sysprep` predefined by {product-title} and suitable for Microsoft ISO files. For other ISO files, you might need to create a new config map file with a system-specific `sysprep` definition.
+The example pipelines use a config map file with `sysprep` predefined by {product-title} and suitable for Microsoft ISO files. For ISO files pertaining to different Windows editions, it may be necessary to create a new config map file with a system-specific sysprep definition.
 ====
 
-include::modules/virt-running-tto-pipeline-web.adoc[leveloffset=+2]
+include::modules/virt-running-ssp-pipeline-web.adoc[leveloffset=+2]
 
-include::modules/virt-running-tto-pipeline-cli.adoc[leveloffset=+2]
+include::modules/virt-running-ssp-pipeline-cli.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 [id="additional-resources_virt-managing-vms-openshift-pipelines"]
