Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion hosted_control_planes/hcp-prepare/hcp-requirements.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,19 @@ include::modules/hcp-support-matrix.adoc[leveloffset=+1]

[role="_additional-resources"]
.Additional resources

* link:https://access.redhat.com/support/policy/updates/openshift_operators[OpenShift Operator Life Cycles]
* xref:../../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc#hcp-shared-infra_hcp-sizing-guidance[Shared infrastructure between hosted and standalone control planes]
* link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.16/html/clusters/cluster_mce_overview#remove-managed-cluster[Removing a cluster from management]
* link:https://access.redhat.com/articles/7136929[The multicluster engine for Kubernetes operator 2.11 Support Matrix]
* xref:../../hosted_control_planes/hcp-release-notes.adoc#hcp-release-notes-technology-preview-tables_hcp-release-notes[Technology Preview features status]

//FIPS-enabled hosted clusters
include::modules/hcp-fips.adoc[leveloffset=+1]

[role="_additional-resources"]
.Additional resources
* link:https://access.redhat.com/articles/7120837[The {mce} 2.9 support matrix]
* link:https://access.redhat.com/articles/7136929[The multicluster engine for Kubernetes operator 2.11 Support Matrix]
* link:https://access.redhat.com/labs/ocpouic/?operator=multicluster-engine&&upgrade_path=4.14%20to%204.16[Red{nbsp}Hat {product-title} Operator Update Information Checker]
* xref:../../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc#hcp-shared-infra_hcp-sizing-guidance[Shared infrastructure between hosted and standalone control planes]

Expand Down
81 changes: 30 additions & 51 deletions modules/hcp-support-matrix.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[role="_abstract"]
Because {mce} includes the HyperShift Operator, releases of {hcp} align with releases of {mce-short}. The support matrix includes details about supported clusters, platforms, and architectures, as well as information about updates and technology preview features.

For more information, see link:https://access.redhat.com/support/policy/updates/openshift_operators[OpenShift Operator Life Cycles].
For more information, see "OpenShift Operator Life Cycles".

[id="hcp-matrix-mgmt_{context}"]
== Management cluster support
Expand Down Expand Up @@ -62,7 +62,7 @@ The following table shows the hosted cluster versions that you can create by usi

[NOTE]
====
Although the HyperShift Operator supports the hosted cluster versions in the following table, {mce-short} supports only as far back as 2 versions earlier than the current version. For example, if the current hosted cluster version is 4.21, {mce-short} supports as far back as version 4.19. If you want to use a hosted cluster version that is earlier than one of the versions that {mce-short} supports, you can detach your hosted clusters from {mce-short} to be unmanaged, or you can use an earlier version of {mce-short}. For instructions to detach your hosted clusters from {mce-short}, see link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.16/html/clusters/cluster_mce_overview#remove-managed-cluster[Removing a cluster from management] ({rh-rhacm} documentation). For more information about {mce-short} support, see link:https://access.redhat.com/articles/7136929[The multicluster engine for Kubernetes operator 2.11 Support Matrix] (Red{nbsp}Hat Knowledgebase).
Although the HyperShift Operator supports the hosted cluster versions in the following table, {mce-short} supports only as far back as 2 versions earlier than the current version. For example, if the current hosted cluster version is 4.21, {mce-short} supports as far back as version 4.19. If you want to use a hosted cluster version that is earlier than one of the versions that {mce-short} supports, you can detach your hosted clusters from {mce-short} to be unmanaged, or you can use an earlier version of {mce-short}. For instructions to detach your hosted clusters from {mce-short}, see "Removing a cluster from management" ({rh-rhacm} documentation). For more information about {mce-short} support, see "The multicluster engine for Kubernetes operator 2.11 Support Matrix" (Red{nbsp}Hat Knowledgebase).
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 [error] Vale.Terms: Use 'Operators?' instead of 'operator'.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignoring this suggestion. The wording here matches the title of the reference.

====

.Hosted cluster version mapped to HyperShift Operator associated with {mce-short} version
Expand All @@ -74,41 +74,25 @@ Although the HyperShift Operator supports the hosted cluster versions in the fol
|Yes
|Yes
|Yes
|Yes
|Yes
|Yes

|4.15
|Yes
|Yes
|Yes
|Yes
|Yes
|Yes
|No
|No
|No

|4.16
|Yes
|Yes
|Yes
|Yes
|Yes
|Yes

|4.17
|No
|Yes
|Yes
|Yes
|Yes
|Yes
|No

|4.18
|No
|No
|Yes
|Yes
|Yes
|Yes
|No

|4.19
|No
Expand All @@ -133,6 +117,7 @@ Although the HyperShift Operator supports the hosted cluster versions in the fol
|No
|No
|Yes

|===

[id="hcp-matrix-platform_{context}"]
Expand Down Expand Up @@ -184,95 +169,88 @@ In the following table, the management cluster version is the {product-title} ve
|{rh-openstack-first} (Technology Preview)
|4.19 - 4.21
|4.19 - 4.21

|===

[id="hcp-matrix-multiarch_{context}"]
== Multi-architecture support

The following tables indicate the support status for {hcp} on multiple architectures. If an architecture is not listed, it is not yet fully supported.
The following tables indicate the supported architectures for {hcp}, organized by platform. If an architecture is not listed, it is not yet fully supported.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we state "If an architecture is not listed, it is not yet fully supported", I removed mentions of architectures that have Technology Preview status. I also removed the "Status" column, as the statement above the table implies that everything in the table is supported (i.e., GA).

.Multi-architecture support for {hcp}
[cols="5",options="header"]
[cols="4",option="header"]
|===
|Platform |Control planes |Compute nodes |{product-title} version support |Status
|Platform |Control planes |Compute nodes |{product-title} version support

|{aws-short}
|64-bit x86
|64-bit x86
|4.16 - 4.21
|General Availability

|{aws-short}
|64-bit x86
|ARM64
|4.17 - 4.21
|General Availability

|{aws-short}
|ARM64
|ARM64
|4.17 - 4.21
|General Availability

|{aws-short}
|ARM64
|64-bit x86
|4.17 - 4.21
|General Availability

|Bare metal (Agent platform)
|64-bit x86
|64-bit x86
|4.14 - 4.21
|General Availability

|Bare metal (Agent platform)
|64-bit x86
|ARM64
|4.21
|General Availability

|Non-bare-metal Agent machines (Technology Preview)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 [error] RedHat.TermsErrors: Use 'bare metal' rather than 'bare-metal'. For more information, see RedHat.TermsErrors.

|64-bit x86
|64-bit x86
|4.16 - 4.21

|{ibm-power-title}
|64-bit x86
|64-bit x86
|4.19 - 4.21

|{ibm-power-title}
|64-bit x86
|ppc64le
|4.17 - 4.21
|General Availability

|{ibm-z-title}
|64-bit x86
|64-bit x86
|4.17 - 4.21

|{ibm-z-title}
|64-bit x86
|s390x
|4.17 - 4.21
|General Availability

|{ibm-z-title}
|s390x
|s390x
|4.20 - 4.21
|General Availability

|Non-bare-metal Agent machines
|64-bit x86
|64-bit x86
|4.16 - 4.21
|Technology Preview

|{VirtProductName}
|64-bit x86
|64-bit x86
|4.14 - 4.21
|General Availability

|{VirtProductName}
|s390x
|s390x
|4.21
|Technology Preview

|{rh-openstack-first}
|{rh-openstack-first} (Technology Preview)
|64-bit x86
|64-bit x86
|4.19 - 4.21
|Technology Preview

|===

Expand All @@ -284,7 +262,7 @@ When you update to another version of the {mce-short}, your hosted cluster can c

[NOTE]
====
Although the HyperShift Operator supports the hosted cluster versions in the following table, {mce-short} supports only as far back as 2 versions earlier than the current version. For example, if the current hosted cluster version is 4.21, {mce-short} supports as far back as version 4.19. If you want to use a hosted cluster version that is earlier than one of the versions that {mce-short} supports, you can detach your hosted clusters from {mce-short} to be unmanaged, or you can use an earlier version of {mce-short}. For instructions to detach your hosted clusters from {mce-short}, see link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.16/html/clusters/cluster_mce_overview#remove-managed-cluster[Removing a cluster from management] ({rh-rhacm} documentation). For more information about {mce-short} support, see link:https://access.redhat.com/articles/7136929[The multicluster engine for Kubernetes operator 2.11 Support Matrix] (Red{nbsp}Hat Knowledgebase).
Although the HyperShift Operator supports the hosted cluster versions in the following table, {mce-short} supports only as far back as 2 versions earlier than the current version. For example, if the current hosted cluster version is 4.21, {mce-short} supports as far back as version 4.19. If you want to use a hosted cluster version that is earlier than one of the versions that {mce-short} supports, you can detach your hosted clusters from {mce-short} to be unmanaged, or you can use an earlier version of {mce-short}. For instructions to detach your hosted clusters from {mce-short}, see "Removing a cluster from management" ({rh-rhacm} documentation). For more information about {mce-short} support, see "The multicluster engine for Kubernetes operator 2.11 Support Matrix" (Red{nbsp}Hat Knowledgebase).
Comment thread
lahinson marked this conversation as resolved.
====

.Updated {mce-short} version support for hosted clusters
Expand All @@ -309,6 +287,7 @@ Although the HyperShift Operator supports the hosted cluster versions in the fol

|Updated from 2.10 to 2.11
|{product-title} 4.14 - 4.20

|===

For example, if you have an {product-title} 4.18 hosted cluster on the management cluster and you update from {mce-short} 2.8 to 2.9, the hosted cluster can continue to run.
Expand Down