Skip to content

Commit 108fa0f

Browse files
authored
Merge pull request #40896 from codyhoag/rhel-support-and-removal
OSDOCS-3149 RHEL 8 compute node docs
2 parents 3f58b44 + ac89197 commit 108fa0f

8 files changed

+32
-73
lines changed

installing/installing-fips.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Because FIPS must be enabled before the operating system that your cluster uses
2626
|Attributes
2727
|Limitations
2828

29-
|FIPS support in {op-system-base} 7, {op-system-base} 8, and {op-system} operating systems.
29+
|FIPS support in {op-system-base} 8 and {op-system} operating systems.
3030
.3+|The FIPS implementation does not offer a single function that both computes hash functions and validates the keys that are based on that hash. This limitation will continue to be evaluated and improved in future {product-title} releases.
3131

3232
|FIPS support in CRI-O runtimes.
3333
|FIPS support in {product-title} services.
3434

35-
|FIPS Validated / Modules in Process cryptographic module and algorithms that are obtained from {op-system-base} 7, {op-system-base} 8, and {op-system} binaries and images.
35+
|FIPS Validated / Modules in Process cryptographic module and algorithms that are obtained from {op-system-base} 8 and {op-system} binaries and images.
3636
|
3737

3838
|Use of FIPS compatible golang compiler.
@@ -84,4 +84,4 @@ If you are using Azure File storage, you cannot enable FIPS mode.
8484

8585
To apply `AES CBC` encryption to your etcd data store, follow the xref:../security/encrypting-etcd.adoc#encrypting-etcd[Encrypting etcd data] process after you install your cluster.
8686

87-
If you add {op-system-base} nodes to your cluster, ensure that you enable FIPS mode on the machines before their initial boot. See xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding RHEL compute machines to an {product-title} cluster] and link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/security_guide/chap-federal_standards_and_regulations#sec-Enabling-FIPS-Mode[Enabling FIPS Mode] in the {op-system-base} 7 documentation or link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/using-the-system-wide-cryptographic-policies_security-hardening#enabling-fips-mode-in-a-container_using-the-system-wide-cryptographic-policies[Enabling FIPS Mode] in the {op-system-base} 8 documentation
87+
If you add {op-system-base} nodes to your cluster, ensure that you enable FIPS mode on the machines before their initial boot. See xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding RHEL compute machines to an {product-title} cluster] and link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/using-the-system-wide-cryptographic-policies_security-hardening#enabling-fips-mode-in-a-container_using-the-system-wide-cryptographic-policies[Enabling FIPS Mode] in the {op-system-base} 8 documentation.

modules/creating-machines-bare-metal.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To install {op-system} on the machines, follow either the steps to use an ISO im
1313

1414
[NOTE]
1515
====
16-
The compute node deployment steps included in this installation document are {op-system}-specific. If you choose instead to deploy {op-system-base}-based compute nodes, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Use of {op-system-base} 7 compute machines is deprecated and planned for removal in a future release of {product-title} 4.
16+
The compute node deployment steps included in this installation document are {op-system}-specific. If you choose instead to deploy {op-system-base}-based compute nodes, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Only {op-system-base} 8 compute machines are supported.
1717
====
1818

1919
You can configure {op-system} during ISO and PXE installations by using the following methods:

modules/installation-requirements-user-infra.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ these cluster machines.
9999
endif::ibm-z[]
100100
====
101101

102-
The bootstrap and control plane machines must use {op-system-first} as the operating system. However, the compute machines can choose between {op-system-first}, {op-system-base-full} 7.9, or {op-system-base} 8.4.
102+
The bootstrap and control plane machines must use {op-system-first} as the operating system. However, the compute machines can choose between {op-system-first}, {op-system-base} 8.4, or {op-system-base} 8.5.
103103

104104
ifndef::openshift-origin[]
105105
Note that {op-system} is based on {op-system-base-full} 8 and inherits all of its hardware certifications and requirements.
@@ -169,7 +169,7 @@ endif::ibm-z[]
169169
ifndef::openshift-origin[]
170170
|Compute
171171
ifdef::ibm-z,ibm-power[|{op-system}]
172-
ifndef::ibm-z,ibm-power[|{op-system}, {op-system-base} 7.9, or {op-system-base} 8.4 ^[3]^]
172+
ifndef::ibm-z,ibm-power[|{op-system}, {op-system-base} 8.4, or {op-system-base} 8.5 ^[3]^]
173173
|2
174174
|8 GB
175175
|100 GB
@@ -208,7 +208,7 @@ ifndef::ibm-z,bare-metal[]
208208
endif::ibm-z,bare-metal[]
209209
ifndef::ibm-z[]
210210
2. {product-title} and Kubernetes are sensitive to disk performance, and faster storage is recommended, particularly for etcd on the control plane nodes which require a 10 ms p99 fsync duration. Note that on many cloud platforms, storage size and IOPS scale together, so you might need to over-allocate storage volume to obtain sufficient performance.
211-
3. As with all user-provisioned installations, if you choose to use {op-system-base} compute machines in your cluster, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Use of {op-system-base} 7 compute machines is deprecated and planned for removal in a future release of {product-title} 4.
211+
3. As with all user-provisioned installations, if you choose to use {op-system-base} compute machines in your cluster, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks.
212212
endif::ibm-z[]
213213
--
214214

modules/rhel-compute-requirements.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ ifdef::openshift-origin[]
1919
** Base OS: CentOS 7.4.
2020
endif::[]
2121
ifdef::openshift-enterprise,openshift-webscale[]
22-
** Base OS: link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/installation_guide/index[{op-system-base} 7.9] or link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_a_standard_rhel_installation/index[{op-system-base} 8.4] with "Minimal" installation option.
22+
** Base OS: link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_a_standard_rhel_installation/index[{op-system-base} 8.4 or 8.5] with "Minimal" installation option.
2323
+
2424
[IMPORTANT]
2525
====
26-
Adding {op-system-base} 7 compute machines to an {product-title} cluster is deprecated. Deprecated functionality is still included in {product-title} and continues to be supported; however, it will be removed in a future release of this product and is not recommended for new deployments.
26+
Adding {op-system-base} 7 compute machines to an {product-title} cluster is not supported.
2727
28-
In addition, you cannot upgrade your {op-system-base} 7 compute machines to {op-system-base} 8. You must deploy new {op-system-base} 8 hosts, and the old {op-system-base} 7 hosts should be removed. See the "Deleting nodes" section for more information.
28+
If you have {op-system-base} 7 compute machines that were previously supported in a past {product-title} version, you cannot upgrade them to {op-system-base} 8. You must deploy new {op-system-base} 8 hosts, and the old {op-system-base} 7 hosts should be removed. See the "Deleting nodes" section for more information.
2929
3030
For the most recent list of major functionality that has been deprecated or removed within {product-title}, refer to the _Deprecated and removed features_ section of the {product-title} release notes.
3131
====
32-
** If you deployed {product-title} in FIPS mode, you must enable FIPS on the {op-system-base} machine before you boot it. See link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/security_guide/chap-federal_standards_and_regulations#sec-Enabling-FIPS-Mode[Enabling FIPS Mode] in the {op-system-base} 7 documentation.
32+
** If you deployed {product-title} in FIPS mode, you must enable FIPS on the {op-system-base} machine before you boot it. See link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/assembly_installing-a-rhel-8-system-with-fips-mode-enabled_security-hardening[Installing a RHEL 8 system with FIPS mode enabled] in the {op-system-base} 8 documentation.
3333

3434
[IMPORTANT]
3535
====

modules/rhel-compute-updating.adoc

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ After you update your cluster, you must update the {op-system-base-full} compute
1010

1111
[IMPORTANT]
1212
====
13-
{op-system-base-full} version 7.9 and version 8.4 is supported for {op-system-base} worker (compute) machines.
13+
{op-system-base-full} versions 8.4 and 8.5 are supported for {op-system-base} compute machines.
1414
====
1515

1616
You can also update your compute machines to another minor version of {product-title} if you are using {op-system-base} as the operating system. You do not need to exclude any RPM packages from {op-system-base} when performing a minor version update.
@@ -20,8 +20,6 @@ You can also update your compute machines to another minor version of {product-t
2020
You cannot upgrade {op-system-base} 7 compute machines to {op-system-base} 8. You must deploy new {op-system-base} 8 hosts, and the old {op-system-base} 7 hosts should be removed.
2121
====
2222

23-
// TODO: This module needs to be updated to reflect RHEL 8 compute machines in 4.10. Because initial support for RHEL 8 starts in 4.9, and upgrading RHEL 7 -> 8 in-place is not supported, this is being left to reflect RHEL 7 upgrades.
24-
2523
.Prerequisites
2624

2725
* You updated your cluster.
@@ -54,10 +52,10 @@ By default, the base OS RHEL with "Minimal" installation option enables firewall
5452
+
5553
[source,terminal]
5654
----
57-
# subscription-manager repos --disable=rhel-7-server-ose-4.8-rpms \
58-
--enable=rhel-7-server-ansible-2.9-rpms \
59-
--enable=rhel-7-server-ose-4.9-rpms
55+
# subscription-manager repos --disable=rhel-7-server-ose-4.9-rpms \
56+
--enable=rhel-7-server-ose-4.10-rpms
6057
----
58+
// As of OCP 4.10 GA, there are no openshift-ansible el8 packages built for RHEL8, so QE advised that we still run the playbook on RHEL7 machines.
6159

6260
.. On the machine that you run the Ansible playbooks, update the required packages, including `openshift-ansible`:
6361
+
@@ -70,36 +68,13 @@ By default, the base OS RHEL with "Minimal" installation option enables firewall
7068
+
7169
[source,terminal]
7270
----
73-
# subscription-manager repos --disable=rhel-7-server-ose-4.8-rpms \
74-
--enable=rhel-7-server-ose-4.9-rpms \
75-
--enable=rhel-7-fast-datapath-rpms \
76-
--enable=rhel-7-server-optional-rpms
71+
# subscription-manager repos --disable=rhocp-4.9-for-rhel-8-x86_64-rpms \
72+
--enable=rhocp-4.10-for-rhel-8-x86_64-rpms
7773
----
7874

7975
. Update a {op-system-base} worker machine:
80-
.. Review the current node status to determine which {op-system-base} worker to update:
81-
+
82-
[source,terminal]
83-
----
84-
# oc get node
85-
----
86-
+
87-
.Example output
88-
[source,terminal]
89-
----
90-
NAME STATUS ROLES AGE VERSION
91-
mycluster-control-plane-0 Ready master 145m v1.23.0
92-
mycluster-control-plane-1 Ready master 145m v1.23.0
93-
mycluster-control-plane-2 Ready master 145m v1.23.0
94-
mycluster-rhel7-0 NotReady,SchedulingDisabled worker 98m v1.23.0
95-
mycluster-rhel7-1 Ready worker 98m v1.23.0
96-
mycluster-rhel7-2 Ready worker 98m v1.23.0
97-
mycluster-rhel7-3 Ready worker 98m v1.23.0
98-
----
99-
+
100-
Note which machine has the `NotReady,SchedulingDisabled` status.
10176

102-
.. Review your Ansible inventory file at `/<path>/inventory/hosts` and update its contents so that only the machine with the `NotReady,SchedulingDisabled` status is listed in the `[workers]` section, as shown in the following example:
77+
.. Review your Ansible inventory file at `/<path>/inventory/hosts` and update its contents so that the {op-system-base} 8 machines are listed in the `[workers]` section, as shown in the following example:
10378
+
10479
----
10580
[all:vars]
@@ -109,7 +84,10 @@ ansible_user=root
10984
openshift_kubeconfig_path="~/.kube/config"
11085
11186
[workers]
112-
mycluster-rhel7-0.example.com
87+
mycluster-rhel8-0.example.com
88+
mycluster-rhel8-1.example.com
89+
mycluster-rhel8-2.example.com
90+
mycluster-rhel8-3.example.com
11391
----
11492

11593
.. Change to the `openshift-ansible` directory:
@@ -131,8 +109,6 @@ $ ansible-playbook -i /<path>/inventory/hosts playbooks/upgrade.yml <1>
131109
====
132110
The `upgrade` playbook only upgrades the {product-title} packages. It does not update the operating system packages.
133111
====
134-
+
135-
. Follow the process in the previous step to update each {op-system-base} worker machine in your cluster.
136112

137113
. After you update all of the workers, confirm that all of your cluster nodes have updated to the new version:
138114
+
@@ -148,11 +124,12 @@ NAME STATUS ROLES AGE VERSIO
148124
mycluster-control-plane-0 Ready master 145m v1.23.0
149125
mycluster-control-plane-1 Ready master 145m v1.23.0
150126
mycluster-control-plane-2 Ready master 145m v1.23.0
151-
mycluster-rhel7-0 NotReady,SchedulingDisabled worker 98m v1.23.0
152-
mycluster-rhel7-1 Ready worker 98m v1.23.0
153-
mycluster-rhel7-2 Ready worker 98m v1.23.0
154-
mycluster-rhel7-3 Ready worker 98m v1.23.0
127+
mycluster-rhel8-0 Ready worker 98m v1.23.0
128+
mycluster-rhel8-1 Ready worker 98m v1.23.0
129+
mycluster-rhel8-2 Ready worker 98m v1.23.0
130+
mycluster-rhel8-3 Ready worker 98m v1.23.0
155131
----
132+
156133
. Optional: Update the operating system packages that were not updated by the `upgrade` playbook. To update packages that are not on {product-version}, use the following command:
157134
+
158135
[source,terminal]

modules/rhel-images-aws.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This account ID is required to display AMI IDs for images that are provided by R
4040
4141
[NOTE]
4242
====
43-
When creating a {op-system-base} compute machine for AWS, ensure that the AMI is {op-system-base} 8.4.
43+
When creating a {op-system-base} compute machine for AWS, ensure that the AMI is {op-system-base} 8.4 or 8.5.
4444
====
4545

4646
.Example output

modules/rhel-preparing-node.adoc

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,33 +68,14 @@ Alternatively, disable all repositories:
6868
+
6969
Note that this might take a few minutes if you have a large number of available repositories
7070

71-
. Enable only the repositories required by {product-title} {product-version}.
72-
73-
.. For {op-system-base} 7 nodes, you must enable the following repositories:
74-
+
75-
[source,terminal]
76-
----
77-
# subscription-manager repos \
78-
--enable="rhel-7-server-rpms" \
79-
--enable="rhel-7-fast-datapath-rpms" \
80-
--enable="rhel-7-server-extras-rpms" \
81-
--enable="rhel-7-server-optional-rpms" \
82-
--enable="rhel-7-server-ose-4.9-rpms"
83-
----
84-
+
85-
[NOTE]
86-
====
87-
Use of {op-system-base} 7 nodes is deprecated and planned for removal in a future release of {product-title} 4.
88-
====
89-
90-
.. For {op-system-base} 8 nodes, you must enable the following repositories:
71+
. Enable only the repositories required by {product-title} {product-version}:
9172
+
9273
[source,terminal]
9374
----
9475
# subscription-manager repos \
9576
--enable="rhel-8-for-x86_64-baseos-rpms" \
9677
--enable="rhel-8-for-x86_64-appstream-rpms" \
97-
--enable="rhocp-4.9-for-rhel-8-x86_64-rpms" \
78+
--enable="rhocp-4.10-for-rhel-8-x86_64-rpms" \
9879
--enable="fast-datapath-for-rhel-8-x86_64-rpms"
9980
----
10081

modules/rhel-preparing-playbook-machine.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ If you use SSH key-based authentication, you must manage the key with an SSH age
6464
--enable="rhel-7-server-rpms" \
6565
--enable="rhel-7-server-extras-rpms" \
6666
--enable="rhel-7-server-ansible-2.9-rpms" \
67-
--enable="rhel-7-server-ose-4.9-rpms"
67+
--enable="rhel-7-server-ose-4.10-rpms"
6868
----
69+
// As of OCP 4.10 GA, there are no openshift-ansible el8 packages built for RHEL8, so QE advised that we still run the playbook on RHEL7 machines.
6970

7071
. Install the required packages, including `openshift-ansible`:
7172
+

0 commit comments

Comments
 (0)