Skip to content

Commit 06c872e

Browse files
committed
removing hcp module for classic
fixing pr link errors fixing pr link error fixing pr hcp link error fixing pr rosa link fing dup in add recources in assembly hcp upgrading applying review comments applying review comment applying review comm fix table fix tables fix tabl fix tab fix ta
1 parent 570dd9e commit 06c872e

File tree

7 files changed

+21
-31
lines changed

7 files changed

+21
-31
lines changed

_topic_maps/_topic_map_rosa.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,6 @@ Name: Upgrading
728728
Dir: upgrading
729729
Distros: openshift-rosa
730730
Topics:
731-
- Name: Upgrading ROSA with HCP clusters
732-
File: rosa-hcp-upgrading
733731
- Name: Upgrading ROSA Classic clusters
734732
File: rosa-upgrading-sts
735733
---

modules/rosa-hcp-upgrade-options.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: CONCEPT
22
[id="rosa-upgrade-options_{context}"]
3-
= Upgrade options for {hcp-title} clusters
3+
= Upgrade options for {product-title} clusters
44

55
In OpenShift, upgrading means provisioning a new component with updated software and using it to replace an existing component that has outdated software.
66

modules/rosa-hcp-upgrading-cli-control-plane.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
ifeval::["{context}" != "rosa-hcp-upgrading-whole-cluster"]
1111
= Upgrading the hosted control plane with the ROSA CLI
1212

13-
You can manually upgrade the hosted control plane of a {hcp-title} cluster by using the ROSA CLI. This method schedules the control plane for an upgrade if a more recent version is available, either immediately, or at a specified future time.
13+
You can manually upgrade the hosted control plane of a {product-title} cluster by using the ROSA CLI. This method schedules the control plane for an upgrade if a more recent version is available, either immediately, or at a specified future time.
1414

1515
[NOTE]
1616
====
17-
Your control plane only supports machine pools within two minor Y-stream versions. For example, a {hcp-title} cluster with a control plane using version 4.15.z supports machine pools with version 4.13.z and 4.14.z, but the control plane does not support machine pools using version 4.12.z.
17+
Your control plane only supports machine pools within two minor Y-stream versions. For example, a {product-title} cluster with a control plane using version 4.15.z supports machine pools with version 4.13.z and 4.14.z, but the control plane does not support machine pools using version 4.12.z.
1818
====
1919

2020
endif::[]

rosa_architecture/about-hcp.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,22 +179,25 @@ endif::openshift-rosa-hcp[]
179179
ifndef::openshift-rosa-hcp[]
180180
xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-about-iam-resources[About IAM resources]
181181
endif::openshift-rosa-hcp[]
182-
| link:https://red.ht/rosa-roadmap[ROSA roadmap]
183182

183+
|link:https://red.ht/rosa-roadmap[ROSA roadmap]
184184
|
185185
ifdef::openshift-rosa-hcp[]
186186
link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-understand-availability.html#rosa-policy-understand-availability[About availability]
187187
endif::openshift-rosa-hcp[]
188188
ifndef::openshift-rosa-hcp[]
189189
xref:../../rosa_architecture/rosa_policy_service_definition/rosa-policy-understand-availability.adoc#rosa-policy-understand-availability[About availability]
190190
endif::openshift-rosa-hcp[]
191-
|
192-
xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading]
191+
//adding condition to get hcp upgrading PR built
192+
ifdef::openshift-rosa-hcp[]
193+
|xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading]
194+
endif::openshift-rosa-hcp[]
193195
|
194196
|
195197

196198
|===
197199

200+
198201
[id="Developer"]
199202
=== Developer
200203

rosa_hcp/rosa-hcp-egress-zero-install.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ All public and private clusters with {egress-zero} get their Red{nbsp}Hat contai
1212
{egress-zero-title} use AWS ECR to provision your clusters without the need for public internet. Because necessary cluster lifecycle processes occur over AWS private networking, AWS ECR serves as a critical service for core cluster platform images. For more information on AWS ECR, see link:https://aws.amazon.com/ecr/[Amazon Elastic Container Registry].
1313

1414
You can create a fully operational cluster that does not require a public egress by configuring a virtual private cloud (VPC) and using the `--properties zero_egress:true` flag when creating your cluster.
15-
16-
See xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {product-title} clusters] to upgrade clusters using {egress-zero}.
15+
//condition out to build pruning PR
16+
ifdef::openshift-rosa-hcp[]
17+
See xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {product-title} clusters] to upgrade clusters using {egress-zero}.
18+
endif::openshift-rosa-hcp[]
1719

1820
[NOTE]
1921
====

upgrading/rosa-hcp-upgrading.adoc

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,23 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/attributes-openshift-dedicated.adoc[]
33
[id="rosa-hcp-upgrading"]
4-
= Upgrading {hcp-title} clusters
4+
= Upgrading {product-title} clusters
55
:context: rosa-hcp-upgrading
66

77
toc::[]
88

99
include::modules/rosa-hcp-upgrade-options.adoc[leveloffset=+1]
1010

1111
.Additional resources
12-
ifndef::openshift-rosa-hcp[]
1312
* xref:../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-edit-machinepool_rosa-managing-objects-cli[ROSA CLI reference: `rosa edit machinepool`]
14-
endif::openshift-rosa-hcp[]
15-
ifdef::openshift-rosa[]
16-
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-service-definition[Node lifecycle]
17-
endif::openshift-rosa[]
18-
ifdef::openshift-rosa-hcp[]
19-
* link:https://docs.openshift.com/rosa/cli_reference/rosa_cli/rosa-manage-objects-cli.html#rosa-edit-machinepool_rosa-managing-objects-cli[ROSA CLI reference: `rosa edit machinepool`]
20-
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-hcp-service-definition[Node lifecycle]
21-
endif::openshift-rosa-hcp[]
13+
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-service-definition[Node lifecycle]
2214
2315
//This cannot be a module if we want to use the xrefs
2416
[id="rosa-lifecycle-policy_{context}"]
2517
== Life cycle policies and planning
2618

2719
To plan an upgrade, review the
28-
ifdef::openshift-rosa[]
29-
xref:../rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.adoc#rosa-life-cycle[{product-title} update life cycle].
30-
endif::openshift-rosa[]
31-
ifdef::openshift-rosa-hcp[]
32-
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle].
33-
endif::openshift-rosa-hcp[]
20+
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{product-title} update life cycle].
3421

3522
The life cycle page includes release definitions, support and upgrade requirements, installation policy information and life cycle dates.
3623

@@ -39,7 +26,7 @@ Upgrades are manually initiated or automatically scheduled. Red Hat Site Reliabi
3926
//The following note should be removed when the entire HCP fleet is confirmed multi-arch
4027
[NOTE]
4128
====
42-
If your control plane is not currently multi-architecture enabled, the upgrade process will first migrate the cluster to a multi-architecture image and then apply the version upgrade. Multi-architecture clusters are capable of running both x86-based and Arm-based workloads. Clusters created after 25 July, 2024 are multi-architecture enabled by default.
29+
If your control plane is not currently multi-architecture enabled, the upgrade process will first migrate the cluster to a multi-architecture image and then apply the version upgrade. Multi-architecture clusters are capable of running both x86-based and Arm-based workloads. Clusters created after 25 July, 2024 are multi-architecture enabled by default.
4330
====
4431

4532
include::modules/rosa-hcp-upgrading-cli-control-plane.adoc[leveloffset=+1]

welcome/about-hcp.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ Use the following sections to find content to help you learn about and use {hcp-
6565
| xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
6666
|
6767
|
68-
69-
|
70-
| xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading]
71-
|
68+
//adding condition to get hcp upgrading PR built
69+
ifdef::openshift-rosa-hcp[]
70+
xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading]
71+
endif::openshift-rosa-hcp[]
7272
|
7373

7474
|===

0 commit comments

Comments
 (0)