Skip to content

Commit c854128

Browse files
skrthomasEricPonvelle
authored andcommitted
BZ1887404: Add allowlist firewall info for NTP servers and custom DNS
1 parent d53007c commit c854128

File tree

10 files changed

+164
-53
lines changed

10 files changed

+164
-53
lines changed

_topic_map.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,15 +1509,15 @@ Topics:
15091509
File: applying-autoscaling
15101510
- Name: Creating infrastructure machine sets
15111511
File: creating-infrastructure-machinesets
1512+
- Name: Adding a RHEL compute machine
1513+
File: adding-rhel-compute
1514+
Distros: openshift-enterprise
1515+
- Name: Adding more RHEL compute machines
1516+
File: more-rhel-compute
1517+
Distros: openshift-enterprise
15121518
- Name: User-provisioned infrastructure
15131519
Dir: user_infra
15141520
Topics:
1515-
- Name: Adding a RHEL compute machine
1516-
File: adding-rhel-compute
1517-
Distros: openshift-enterprise
1518-
- Name: Adding more RHEL compute machines
1519-
File: more-rhel-compute
1520-
Distros: openshift-enterprise
15211521
- Name: Adding compute machines to AWS using CloudFormation templates
15221522
File: adding-aws-compute-user-infra
15231523
- Name: Adding compute machines to vSphere

installing/installing-fips.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ To install a cluster in FIPS mode, follow the instructions to install a customiz
7575

7676
[NOTE]
7777
====
78-
If you are using Azure File storage, you cannot enable FIPS mode.
78+
If you are using Azure File storage, you cannot enable FIPS mode.
7979
====
8080

8181
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.
8282

83-
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/user_infra/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.
83+
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.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[id="adding-rhel-compute"]
2+
= Adding RHEL compute machines to an {product-title} cluster
3+
include::modules/common-attributes.adoc[]
4+
:context: adding-rhel-compute
5+
6+
toc::[]
7+
8+
In {product-title}, you can add Red Hat Enterprise Linux (RHEL) compute, or worker, machines to a user-provisioned infrastructure cluster or a installation-provisioned infrastructure cluster. You can use RHEL as the operating system on only compute machines.
9+
10+
include::modules/rhel-compute-overview.adoc[leveloffset=+1]
11+
12+
include::modules/rhel-compute-requirements.adoc[leveloffset=+1]
13+
14+
[id="adding-rhel-compute-preparing-image-cloud"]
15+
== Preparing an image for your cloud
16+
17+
Amazon Machine Images (AMI) are required because various image formats cannot be used directly by AWS. You may use the AMIs that Red Hat has provided, or you can manually import your own images. The AMI must exist before the EC2 instance can be provisioned. You will need a valid AMI ID so that the correct {op-system-base} version needed for the compute machines is selected.
18+
19+
include::modules/rhel-images-aws.adoc[leveloffset=+2]
20+
21+
.Additional resources
22+
* You may also manually link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/image_builder_guide/sect-documentation-image_builder-chapter5-section_2[import {op-system-base} images to AWS].
23+
24+
include::modules/rhel-preparing-playbook-machine.adoc[leveloffset=+1]
25+
26+
include::modules/rhel-preparing-node.adoc[leveloffset=+1]
27+
28+
include::modules/rhel-worker-tag.adoc[leveloffset=+2]
29+
30+
include::modules/rhel-adding-node.adoc[leveloffset=+1]
31+
32+
include::modules/installation-approve-csrs.adoc[leveloffset=+1]
33+
34+
include::modules/rhel-ansible-parameters.adoc[leveloffset=+1]
35+
36+
include::modules/rhel-removing-rhcos.adoc[leveloffset=+2]
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[id="more-rhel-compute"]
2+
= Adding more RHEL compute machines to an {product-title} cluster
3+
include::modules/common-attributes.adoc[]
4+
:context: more-rhel-compute
5+
6+
toc::[]
7+
8+
If your {product-title} cluster already includes Red Hat Enterprise Linux (RHEL) compute machines, which are also known as worker machines, you can add more RHEL compute machines to it.
9+
10+
include::modules/rhel-compute-overview.adoc[leveloffset=+1]
11+
12+
include::modules/rhel-compute-requirements.adoc[leveloffset=+1]
13+
14+
[id="more-rhel-compute-preparing-image-cloud"]
15+
== Preparing an image for your cloud
16+
17+
Amazon Machine Images (AMI) are required since various image formats cannot be used directly by AWS. You may use the AMIs that Red Hat has provided, or you can manually import your own images. The AMI must exist before the EC2 instance can be provisioned. You must list the AMI IDs so that the correct {op-system-base} version needed for the compute machines is selected.
18+
19+
include::modules/rhel-images-aws.adoc[leveloffset=+2]
20+
21+
.Additional resources
22+
* You may also manually link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/image_builder_guide/sect-documentation-image_builder-chapter5-section_2[import {op-system-base} images to AWS].
23+
24+
include::modules/rhel-preparing-node.adoc[leveloffset=+1]
25+
26+
include::modules/rhel-worker-tag.adoc[leveloffset=+2]
27+
28+
include::modules/rhel-adding-more-nodes.adoc[leveloffset=+1]
29+
30+
include::modules/installation-approve-csrs.adoc[leveloffset=+1]
31+
32+
include::modules/rhel-ansible-parameters.adoc[leveloffset=+1]

machine_management/user_infra/adding-rhel-compute.adoc

Lines changed: 0 additions & 24 deletions
This file was deleted.

machine_management/user_infra/more-rhel-compute.adoc

Lines changed: 0 additions & 20 deletions
This file was deleted.

migration/migrating_3_4/planning-migration-3-to-4.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ In {product-title} {product-version}, you use the OpenShift installation program
5858
For more information, see xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process].
5959

6060
ifndef::openshift-origin[]
61-
If you want to add {op-system-base-full} ({op-system-base}) worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../../machine_management/user_infra/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster].
61+
If you want to add {op-system-base-full} ({op-system-base}) worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster].
6262
endif::[]
6363

6464
[discrete]

modules/configuring-firewall.adoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,13 @@ the routes work. If you are the cluster administrator and do not want to allow
151151
* `console-openshift-console.apps.<cluster_name>.<base_domain>`, or the host name
152152
that is specified in the `spec.route.hostname` field of the
153153
`consoles.operator/cluster` object if the field is not empty.
154+
155+
. If you use a default Red Hat Network Time Protocol (NTP) server allow the following URLs:
156+
* `1.rhel.pool.ntp.org`
157+
* `2.rhel.pool.ntp.org`
158+
* `3.rhel.pool.ntp.org`
159+
160+
[NOTE]
161+
====
162+
If you do not use a default Red Hat NTP server, verify the NTP server for your platform and allow it in your firewall.
163+
====

modules/rhel-images-aws.adoc

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * machine_management/adding-rhel-compute.adoc
4+
// * machine_management/more-rhel-compute.adoc
5+
6+
[id="rhel-images-aws_{context}"]
7+
= Listing latest available RHEL images on AWS
8+
9+
AMI IDs correspond to native boot images for AWS. Because an AMI must exist before the EC2 instance is provisioned, you will need to know the AMI ID before configuration. The link:https://aws.amazon.com/cli/[AWS Command Line Interface (CLI)] is used to list the available {op-system-base-full} image IDs.
10+
11+
.Prerequisites
12+
13+
* You have installed the AWS CLI.
14+
15+
.Procedure
16+
17+
* Use this command to list {op-system-base} 7.9 Amazon Machine Images (AMI):
18+
+
19+
[source,terminal]
20+
----
21+
$ aws ec2 describe-images --owners 309956199498 \ <1>
22+
--query 'sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]' \ <2>
23+
--filters "Name=name,Values=RHEL-7.9*" \ <3>
24+
--region us-east-1 \ <4>
25+
--output table <5>
26+
----
27+
+
28+
<1> The `--owners` command option shows Red Hat images based on the account ID `309956199498`.
29+
+
30+
[IMPORTANT]
31+
====
32+
This account ID is required to display AMI IDs for images that are provided by Red Hat.
33+
====
34+
+
35+
<2> The `--query` command option sets how the images are sorted with the parameters `'sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]'`. In this case, the images are sorted by the creation date, and the table is structured to show the creation date, the name of the image, and the AMI IDs.
36+
<3> The `--filter` command option sets which version of {op-system-base} is shown. In this example, since the filter is set by `"Name=name,Values=RHEL-7.9*"`, then {op-system-base} 7.9 AMIs are shown.
37+
<4> The `--region` command option sets where the region where an AMI is stored.
38+
<5> The `--output` command option sets how the results are displayed.
39+
40+
[NOTE]
41+
====
42+
When creating a {op-system-base} compute machine for AWS, ensure that the AMI is {op-system-base} 7.9.
43+
====
44+
+
45+
.Example output
46+
[source,terminal]
47+
----
48+
----------------------------------------------------------------------------------------------------------
49+
| DescribeImages |
50+
+---------------------------+----------------------------------------------------+-----------------------+
51+
| 2020-05-13T09:50:36.000Z | RHEL-7.9_HVM_BETA-20200422-x86_64-0-Hourly2-GP2 | ami-038714142142a6a64 |
52+
| 2020-09-18T07:51:03.000Z | RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2 | ami-005b7876121b7244d |
53+
| 2021-02-09T09:46:19.000Z | RHEL-7.9_HVM-20210208-x86_64-0-Hourly2-GP2 | ami-030e754805234517e |
54+
+---------------------------+----------------------------------------------------+-----------------------+
55+
----

modules/rhel-worker-tag.adoc

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * machine_management/adding-rhel-compute.adoc
4+
// * machine_management/more-rhel-compute.adoc
5+
6+
7+
[id="rhel-worker-tag_{context}"]
8+
= Tagging a {op-system-base} worker node as owned or shared
9+
10+
A cluster uses the value of the `kubernetes.io/cluster/<clusterid>,Value=(owned|shared)` tag to determine the lifetime of the resources related to the AWS cluster.
11+
12+
* The `owned` tag value should be added if the resource should be destroyed as part of destroying the cluster.
13+
* The `shared` tag value should be added if the resource continues to exist after the cluster has been destroyed. This tagging denotes that the cluster uses this resource, but there is a separate owner for the resource.
14+
15+
.Procedure
16+
17+
* With {op-system-base} compute machines, the {op-system-base} worker instance must be tagged with `kubernetes.io/cluster/<clusterid>=owned` or `kubernetes.io/cluster/<cluster-id>=shared`.
18+
19+
[NOTE]
20+
====
21+
Do not tag all existing security groups with the `kubernetes.io/cluster/<name>,Value=<clusterid>` tag, or the Elastic Load Balancing (ELB) will not be able to create a load balancer.
22+
====

0 commit comments

Comments
 (0)