Skip to content

Commit c56180f

Browse files
dfitzmaudfitzmau
authored
Merge pull request #100061 from lahinson/osdocs-16249-hcp-support-matrix-4.20
[OSDOCS-16249]: Updating HCP support matrix for 4.20
2 parents 9af8b6e + e543b03 commit c56180f

File tree

2 files changed

+77
-39
lines changed

2 files changed

+77
-39
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ The following requirements apply to {hcp}:
2222
2323
* In Bare Metal Host (BMH) deployments, where the Bare Metal Operator starts machines, the hosted control plane must be able to reach baseboard management controllers (BMCs). If your security profile does not permit the Cluster Baremetal Operator to access the network where the BMHs have their BMCs in order to enable Redfish automation, you can use BYO ISO support. However, in BYO mode, {product-title} cannot automate the powering on of BMHs.
2424
25+
//Support matrix for HCP
2526
include::modules/hcp-support-matrix.adoc[leveloffset=+1]
2627

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

2931
[role="_additional-resources"]
@@ -32,9 +34,9 @@ include::modules/hcp-fips.adoc[leveloffset=+1]
3234
* 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]
3335
* xref:../../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc#hcp-shared-infra_hcp-sizing-guidance[Shared infrastructure between hosted and standalone control planes]
3436
37+
//CIDR ranges for hosted control planes
3538
include::modules/hcp-cidr-ranges.adoc[leveloffset=+1]
3639

3740
[role="_additional-resources"]
3841
.Additional resources
39-
4042
* xref:../../networking/networking_overview/cidr-range-definitions.adoc#cidr-range-definitions[CIDR range definitions]

‎modules/hcp-support-matrix.adoc‎

Lines changed: 74 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ The following table maps {mce-short} versions to the management cluster versions
2626
|===
2727
|Management cluster version |Supported {mce-short} version
2828

29-
|4.14 - 4.15
30-
|2.4
31-
32-
|4.14 - 4.16
33-
|2.5
34-
3529
|4.14 - 4.17
3630
|2.6
3731

@@ -43,6 +37,9 @@ The following table maps {mce-short} versions to the management cluster versions
4337

4438
|4.17 - 4.19
4539
|2.9
40+
41+
|4.18 - 4.20
42+
|2.10
4643
|===
4744

4845
[id="hcp-matrix-hc_{context}"]
@@ -59,58 +56,59 @@ The following table shows the hosted cluster versions that you can create by usi
5956

6057
[NOTE]
6158
====
62-
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.19, {mce-short} supports as far back as version 4.17. 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.13/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/7120837[The multicluster engine for Kubernetes operator 2.9 Support Matrix] (Red{nbsp}Hat Knowledgebase).
59+
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.20, {mce-short} supports as far back as version 4.18. 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.13/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/7120837[The multicluster engine for Kubernetes operator 2.10 Support Matrix] (Red{nbsp}Hat Knowledgebase).
6360
====
6461

6562
.Hosted cluster version mapped to HyperShift Operator associated with {mce-short} version
66-
[cols="7",options="header"]
63+
[cols="6",options="header"]
6764
|===
68-
|Hosted cluster version |HyperShift Operator in {mce-short} 2.4 |HyperShift Operator in {mce-short} 2.5 |HyperShift Operator in {mce-short} 2.6 |HyperShift Operator in {mce-short} 2.7|HyperShift Operator in {mce-short} 2.8|HyperShift Operator in {mce-short} 2.9
65+
|Hosted cluster version |HyperShift Operator in {mce-short} 2.6 |HyperShift Operator in {mce-short} 2.7 |HyperShift Operator in {mce-short} 2.8 |HyperShift Operator in {mce-short} 2.9 |HyperShift Operator in {mce-short} 2.10
6966

7067
|4.14
7168
|Yes
7269
|Yes
7370
|Yes
7471
|Yes
7572
|Yes
76-
|Yes
7773

7874
|4.15
79-
|No
8075
|Yes
8176
|Yes
8277
|Yes
8378
|Yes
8479
|Yes
8580

8681
|4.16
87-
|No
88-
|No
82+
|Yes
8983
|Yes
9084
|Yes
9185
|Yes
9286
|Yes
9387

9488
|4.17
9589
|No
96-
|No
97-
|No
90+
|Yes
9891
|Yes
9992
|Yes
10093
|Yes
10194

10295
|4.18
10396
|No
10497
|No
105-
|No
106-
|No
98+
|Yes
10799
|Yes
108100
|Yes
109101

110102
|4.19
111103
|No
112104
|No
113105
|No
106+
|Yes
107+
|Yes
108+
109+
|4.20
110+
|No
111+
|No
114112
|No
115113
|No
116114
|Yes
@@ -125,7 +123,10 @@ The following table indicates which {product-title} versions are supported for e
125123

126124
[IMPORTANT]
127125
====
128-
For {ibm-power-title} and {ibm-z-title}, you must run the control plane on machine types based on 64-bit x86 architecture, and node pools on {ibm-power-title} or {ibm-z-title}.
126+
For {ibm-power-title} and {ibm-z-title}:
127+
128+
* You must run the control plane on machine types that are based on 64-bit x86 architecture or s390x architecture
129+
* You must run node pools on {ibm-power-title} or {ibm-z-title}
129130
====
130131

131132
In the following table, the management cluster version is the {product-title} version where the {mce-short} is enabled:
@@ -136,32 +137,32 @@ In the following table, the management cluster version is the {product-title} ve
136137
|Hosted cluster platform |Management cluster version |Hosted cluster version
137138

138139
|{aws-full}
139-
|4.16 - 4.19
140-
|4.16 - 4.19
140+
|4.16 - 4.20
141+
|4.16 - 4.20
141142

142143
|{ibm-power-title}
143-
|4.17 - 4.19
144-
|4.17 - 4.19
144+
|4.17 - 4.20
145+
|4.17 - 4.20
145146

146147
|{ibm-z-title}
147-
|4.17 - 4.19
148-
|4.17 - 4.19
148+
|4.17 - 4.20
149+
|4.17 - 4.20
149150

150151
|{VirtProductName}
151-
|4.14 - 4.19
152-
|4.14 - 4.19
152+
|4.14 - 4.20
153+
|4.14 - 4.20
153154

154155
|Bare metal
155-
|4.14 - 4.19
156-
|4.14 - 4.19
156+
|4.14 - 4.20
157+
|4.14 - 4.20
157158

158159
|Non-bare-metal agent machines (Technology Preview)
159-
|4.16 - 4.19
160-
|4.16 - 4.19
160+
|4.16 - 4.20
161+
|4.16 - 4.20
161162

162163
|{rh-openstack-first} (Technology Preview)
163-
|4.19
164-
|4.19
164+
|4.19 - 4.20
165+
|4.19 - 4.20
165166
|===
166167

167168
[id="hcp-matrix-multiarch_{context}"]
@@ -174,6 +175,10 @@ The following tables indicate the support status for {hcp} on multiple architect
174175
|===
175176
|{product-title} version |ARM64 control planes |ARM64 compute nodes
176177

178+
|4.20
179+
|General Availability
180+
|General Availability
181+
177182
|4.19
178183
|General Availability
179184
|General Availability
@@ -204,6 +209,10 @@ The following tables indicate the support status for {hcp} on multiple architect
204209
|===
205210
|{product-title} version |ARM64 control planes |ARM64 compute nodes
206211

212+
|4.20
213+
|Not available
214+
|Technology Preview
215+
207216
|4.19
208217
|Not available
209218
|Technology Preview
@@ -234,6 +243,10 @@ The following tables indicate the support status for {hcp} on multiple architect
234243
|===
235244
|{product-title} version |ARM64 control planes |ARM64 compute nodes
236245

246+
|4.20
247+
|Not available
248+
|Not available
249+
237250
|4.19
238251
|Not available
239252
|Not available
@@ -252,6 +265,16 @@ The following tables indicate the support status for {hcp} on multiple architect
252265
|===
253266
|{product-title} version |Control planes |Compute nodes
254267

268+
|4.20
269+
a|* 64-bit x86: General Availability
270+
* ARM64: Not available
271+
* s390x: Not available
272+
* ppc64le: Not available
273+
a|* 64-bit x86: General Availability
274+
* ARM64: Not available
275+
* s390x: Not available
276+
* ppc64le: General Availability
277+
255278
|4.19
256279
a|* 64-bit x86: General Availability
257280
* ARM64: Not available
@@ -288,6 +311,15 @@ a|* 64-bit x86: Not available
288311
|===
289312
|{product-title} version |Control planes |Compute nodes
290313

314+
|4.20
315+
a|* 64-bit x86: General Availability
316+
* ARM64: Not available
317+
* s390x: General Availability
318+
* ppc64le: Not available
319+
a|* 64-bit x86: Not available
320+
* ARM64: Not available
321+
* s390x: General Availability
322+
291323
|4.19
292324
a|* 64-bit x86: General Availability
293325
* ARM64: Not available
@@ -323,6 +355,10 @@ a|* 64-bit x86: Not available
323355
|===
324356
|{product-title} version |ARM64 control planes |ARM64 compute nodes
325357

358+
|4.20
359+
|Not available
360+
|Not available
361+
326362
|4.19
327363
|Not available
328364
|Not available
@@ -356,17 +392,14 @@ When you update to another version of the {mce-short}, your hosted cluster can c
356392

357393
[NOTE]
358394
====
359-
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.19, {mce-short} supports as far back as version 4.17. 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.13/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/7120837[The multicluster engine for Kubernetes operator 2.9 Support Matrix] (Red{nbsp}Hat Knowledgebase).
395+
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.20, {mce-short} supports as far back as version 4.18. 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.13/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/7120837[The multicluster engine for Kubernetes operator 2.10 Support Matrix] (Red{nbsp}Hat Knowledgebase).
360396
====
361397

362398
.Updated {mce-short} version support for hosted clusters
363399
[cols="2",options="header"]
364400
|===
365401
|Updated {mce-short} version |Supported hosted cluster version
366402

367-
|Updated from 2.4 to 2.5
368-
|{product-title} 4.14
369-
370403
|Updated from 2.5 to 2.6
371404
|{product-title} 4.14 - 4.15
372405

@@ -378,16 +411,19 @@ Although the HyperShift Operator supports the hosted cluster versions in the fol
378411

379412
|Updated from 2.8 to 2.9
380413
|{product-title} 4.14 - 4.18
414+
415+
|Updated from 2.9 to 2.10
416+
|{product-title} 4.14 - 4.19
381417
|===
382418

383-
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.
419+
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.
384420

385421
[id="hcp-matrix-tp_{context}"]
386422
== Technology Preview features
387423

388424
The following list indicates features in this release that have a Technology Preview status:
389425

390-
* {hcp-capital} on {ibm-z-title} in a disconnected environment
426+
* {hcp-capital} using non-bare-metal agent machines
391427
* Custom taints and tolerations for {hcp}
392428
* NVIDIA GPU devices on {hcp} for {VirtProductName}
393429
* {hcp-capital} on {rh-openstack-first}

0 commit comments

Comments
 (0)