Skip to content

Commit 82502f6

Browse files
lahinsonlahinson
authored
Merge pull request #84360 from lahinson/osdocs-12515-hcp-matrix
[OSDOCS-12515]: HCP support matrix
2 parents b598e70 + 7bf5be5 commit 82502f6

File tree

3 files changed

+141
-5
lines changed

3 files changed

+141
-5
lines changed

‎hosted_control_planes/hcp-prepare/hcp-requirements.adoc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
10-
The hosting cluster and workers must run on the same infrastructure. For example, you cannot run your hosting cluster on bare metal and your workers on the cloud. However, the hub cluster and workers do not need to run on the same platform. For example, you might run your hosting cluster on bare metal and workers on {VirtProductName}.
9+
In the context of {hcp}, a _management cluster_ is an {product-title} cluster where the HyperShift Operator is deployed and where the control planes for hosted clusters are hosted. The management cluster and workers must run on the same infrastructure. For example, you cannot run your management cluster on bare metal and your workers on the cloud. However, the management cluster and workers do not need to run on the same platform. For example, you might run your management cluster on bare metal and workers on {VirtProductName}.
1110

1211
The control plane is associated with a hosted cluster and runs as pods in a single namespace. When the cluster service consumer creates a hosted cluster, it creates a worker node that is independent of the control plane.
1312

14-
include::modules/hcp-requirements-platform-version.adoc[leveloffset=+1]
13+
include::modules/hcp-support-matrix.adoc[leveloffset=+1]
14+
15+
[role="_additional-resources"]
16+
.Additional resources
17+
* link:https://access.redhat.com/articles/7086906[The {mce} 2.7 support matrix]
18+
* 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]

‎hosted_control_planes/index.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@ include::modules/hosted-control-planes-version-support.adoc[leveloffset=+1]
1717
* link:https://amd64.ocp.releases.ci.openshift.org/[AMD64 release images]
1818
* link:https://arm64.ocp.releases.ci.openshift.org/[ARM64 release images]
1919
* link:https://multi.ocp.releases.ci.openshift.org/[Multi-arch release images]
20-
//* xref:../scalability_and_performance/using-node-tuning-operator.adoc#node-tuning-hosted-cluster_node-tuning-operator[Configuring node tuning in a hosted cluster]
21-
//* xref:../scalability_and_performance/using-node-tuning-operator.adoc#advanced-node-tuning-hosted-cluster_node-tuning-operator[Advanced node tuning for hosted clusters by setting kernel boot parameters]
2220
2321
include::modules/hosted-control-planes-concepts-personas.adoc[leveloffset=+1]

‎modules/hcp-support-matrix.adoc

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * hosted-control-planes/hcp-prepare/hcp-requirements.adoc
4+
5+
6+
:_mod-docs-content-type: CONCEPT
7+
[id="hcp-support-matrix_{context}"]
8+
= Support matrix for {hcp}
9+
10+
Because {mce} includes the HyperShift Operator, releases of {hcp} align with releases of {mce-short}. For more information, see link:https://access.redhat.com/support/policy/updates/openshift_operators[OpenShift Operator Life Cycles].
11+
12+
[id="hcp-matrix-mgmt_{context}"]
13+
== Management cluster support
14+
15+
Any supported standalone {product-title} cluster can be a management cluster. The following table maps {mce-short} versions to the management cluster versions that support them:
16+
17+
.Supported {mce-short} versions for {product-title} management clusters
18+
[cols="2",options="header"]
19+
|===
20+
|Management cluster version |Supported {mce-short} version
21+
22+
|4.14 - 4.15
23+
|2.4
24+
25+
|4.14 - 4.16
26+
|2.5
27+
28+
|4.14 - 4.17
29+
|2.6
30+
31+
|4.15 - 4.17
32+
|2.7
33+
|===
34+
35+
[id="hcp-matrix-hc_{context}"]
36+
== Hosted cluster support
37+
38+
For hosted clusters, no direct relationship exists the management cluster version and the hosted cluster version. The hosted cluster version depends on the HyperShift Operator that is included with your {mce-short} version. The following table maps {mce-short} versions to which hosted cluster versions you can create by using the HyperShift Operator that is associated with that version of {mce-short}:
39+
40+
.Hosted cluster versions that can be created by {mce-short} versions
41+
[cols="5",options="header"]
42+
|===
43+
|Hosted cluster version |{mce-short} 2.4 |{mce-short} 2.5 |{mce-short} 2.6 |{mce-short} 2.7
44+
45+
|4.14
46+
|Yes
47+
|Yes
48+
|Yes
49+
|Yes
50+
51+
|4.15
52+
|No
53+
|Yes
54+
|Yes
55+
|Yes
56+
57+
|4.16
58+
|No
59+
|No
60+
|Yes
61+
|Yes
62+
63+
|4.17
64+
|No
65+
|No
66+
|No
67+
|Yes
68+
|===
69+
70+
[id="hcp-matrix-platform_{context}"]
71+
== Hosted cluster platform support
72+
73+
The following table indicates which {product-title} versions are supported for each platform of {hcp}. In the table, _Management cluster version_ refers to the {product-title} version where the {mce-short} is enabled:
74+
75+
.Required {product-title} versions for platforms
76+
[cols="3",options="header"]
77+
|===
78+
|Hosted cluster platform |Management cluster version |Hosted cluster version
79+
80+
|{aws-full}
81+
|4.16 - 4.17
82+
|4.16 - 4.17
83+
84+
|{ibm-power-title}
85+
|4.17
86+
|4.17
87+
88+
|{ibm-z-title}
89+
|4.17
90+
|4.17
91+
92+
|{VirtProductName}
93+
|4.14 - 4.17
94+
|4.14 - 4.17
95+
96+
|Bare metal
97+
|4.14 - 4.17
98+
|4.14 - 4.17
99+
100+
|Non-bare-metal agent machines (Technology Preview)
101+
|4.16 - 4.17
102+
|4.16 - 4.17
103+
|===
104+
105+
[id="hcp-matrix-updates_{context}"]
106+
== Updates of {mce-short}
107+
108+
When you update to another version of the {mce-short}, your hosted cluster can continue to run if the HyperShift Operator that is included in the version of {mce-short} supports the hosted cluster version. The following table shows which hosted cluster versions are supported on which updated {mce-short} versions:
109+
110+
.Updated {mce-short} version support for hosted clusters
111+
[cols="2",options="header"]
112+
|===
113+
|Updated {mce-short} version |Supported hosted cluster version
114+
115+
|Updated from 2.4 to 2.5
116+
|{product-title} 4.14
117+
118+
|Updated from 2.5 to 2.6
119+
|{product-title} 4.14 - 4.15
120+
121+
|Updated from 2.6 to 2.7
122+
|{product-title} 4.14 - 4.16
123+
|===
124+
125+
For example, if you have an {product-title} 4.14 hosted cluster on the management cluster and you update from {mce-short} 2.4 to 2.5, the hosted cluster can continue to run.
126+
127+
[id="hcp-matrix-tp_{context}"]
128+
== Technology Preview features
129+
130+
The following list indicates Technology Preview features for this release:
131+
132+
* {hcp-capital} on {ibm-z-title} in a disconnected environment
133+
* Custom taints and tolerations for {hcp} on {VirtProductName}
134+
* NVIDIA GPU devices on {hcp} for {VirtProductName}

0 commit comments

Comments
 (0)