mirror of
https://github.com/openshift/openshift-docs.git
synced 2026-02-05 12:46:18 +01:00
Adding the Upgrading HCP cherrypick
This commit is contained in:
@@ -16,7 +16,20 @@ include::modules/rosa-hcp-upgrade-options.adoc[leveloffset=+1]
|
||||
[id="rosa-lifecycle-policy_{context}"]
|
||||
== Life cycle policies and planning
|
||||
|
||||
<<<<<<< HEAD
|
||||
To plan an upgrade, review the xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle].
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
To plan an upgrade, review the
|
||||
ifdef::openshift-rosa[]
|
||||
xref:../rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.adoc#rosa-life-cycle[{product-title} update life cycle].
|
||||
endif::openshift-rosa[]
|
||||
ifdef::openshift-rosa-hcp[]
|
||||
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle].
|
||||
endif::openshift-rosa-hcp[]
|
||||
=======
|
||||
>>>>>>> a3e00b5379 (Adding the Upgrading HCP cherrypick)
|
||||
>>>>>>> 35bf785d38 (Adding the Upgrading HCP cherrypick)
|
||||
|
||||
The life cycle page includes release definitions, support and upgrade requirements, installation policy information and life cycle dates.
|
||||
|
||||
@@ -44,4 +57,10 @@ Upgrading the entire cluster involves upgrading both the hosted control plane an
|
||||
|
||||
include::modules/rosa-hcp-upgrading-cli-control-plane.adoc[leveloffset=+2]
|
||||
include::modules/rosa-hcp-upgrading-cli-machinepool.adoc[leveloffset=+2]
|
||||
include::modules/rosa-hcp-upgrading-cli-tutorial.adoc[leveloffset=+1]
|
||||
<<<<<<< HEAD
|
||||
include::modules/rosa-hcp-upgrading-cli-tutorial.adoc[leveloffset=+1]
|
||||
=======
|
||||
|
||||
ifdef::prevcontext[:context: {prevcontext}]
|
||||
ifndef::prevcontext[:!context:]
|
||||
>>>>>>> a3e00b5379 (Adding the Upgrading HCP cherrypick)
|
||||
|
||||
Reference in New Issue
Block a user