Skip to content

Commit 67e7593

Browse files
fmcdonalopenshift-cherrypick-robot
authored andcommitted
adding new info for HCP
adding suggestions from gdoc for HCP fixing a warning fixing peer review comments
1 parent 07022d3 commit 67e7593

24 files changed

+112
-206
lines changed

modules/creating-a-machine-pool-ocm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ endif::openshift-rosa,openshift-rosa-hcp[]
5151

5252
. Add a *Machine pool name*.
5353

54-
. Select a *Compute node instance type* from the drop-down menu. The instance type defines the vCPU and memory allocation for each compute node in the machine pool.
54+
. Select a *Compute node instance type* from the list. The instance type defines the vCPU and memory allocation for each compute node in the machine pool.
5555
+
5656
[NOTE]
5757
====

modules/dedicated-aws-dc-existing.adoc

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818

1919
. Log in to the {product-title} AWS Account Dashboard and select the correct region.
2020
. From the {product-title} AWS Account region, select *VPC* from the *Services* menu.
21-
. From *VPN Connections*, select *Virtual Private Gateways*.
22-
. Select *Create Virtual Private Gateway*.
23-
. Give the Virtual Private Gateway a suitable name.
21+
. From *Virtual private network (VPN)*, select *Virtual private gateways*.
22+
. Select *Create virtual private gateway*.
23+
. Give the virtual private gateway a suitable name in the *Details* field.
2424
. Click *Custom ASN* and enter the *Amazon side ASN* value gathered previously or use the Amazon Provided ASN.
25-
. Create the Virtual Private Gateway.
26-
. In the *Navigation* pane of the {product-title} AWS Account Dashboard, choose *Virtual private gateways* and select the virtual private gateway. Choose *View details*.
27-
. Choose *Direct Connect gateway associations* and click *Associate Direct Connect gateway*.
28-
. Under *Association account type*, for Account owner, choose *Another account*.
29-
. For *Direct Connect gateway owner*, enter the ID of the AWS account that owns the Direct Connect gateway.
25+
. Click *Create virtual private gateway*.
26+
. From the {product-title} AWS Account region, select *Direct Connect* from the *Services* menu.
27+
. Click *virtual private gateways* and select the virtual private gateway.
28+
. Click *View details*.
29+
. Click the *Direct Connect gateway associations* tab.
30+
. Click *Associate Direct Connect gateway*
31+
. Under *Association account type*, for Account owner, click *Another account*.
3032
. Under *Association settings*, for Direct Connect gateway ID, enter the ID of the Direct Connect gateway.
31-
. Under *Association settings*, for Virtual interface owner, enter the ID of the AWS account that owns the virtual interface for the association.
32-
. Optional: Add prefixes to Allowed prefixes, separating them using commas.
33-
. Choose *Associate Direct Connect gateway*.
34-
. After the Association Proposal has been sent, it will be waiting for your
35-
acceptance. The final steps you must perform are available in the
33+
. For *Direct Connect gateway owner*, enter the ID of the AWS account that owns the Direct Connect gateway.
34+
. Optional: Add prefixes to *Allowed prefixes*, separating them using commas or put them on separate lines.
35+
. Click *Associate Direct Connect gateway*.
36+
. After the Association Proposal has been sent, it will be waiting for your acceptance. The final steps you must perform are available in the
3637
link:https://docs.aws.amazon.com/directconnect/latest/UserGuide/multi-account-associate-vgw.html[AWS Documentation].

modules/dedicated-aws-dc-hvif.adoc

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,21 @@ Connect Gateway is created.
3131
[id="dedicated-aws-dc-hvif-private"]
3232
== Creating a Private Direct Connect
3333

34-
A Private Direct Connect is created if the Direct Connect Virtual Interface type
35-
is Private.
34+
A Private Direct Connect is created if the Direct Connect Virtual Interface type is Private.
3635

3736
.Procedure
3837

3938
. Log in to the {product-title} AWS Account Dashboard and select the correct region.
4039
. From the AWS region, select *VPC* from the *Services* menu.
41-
. Select *Virtual Private Gateways* from *VPN Connections*.
42-
. Click *Create Virtual Private Gateway*.
40+
. From *Virtual private network (VPN)*, select *Virtual private gateways*.
41+
. Click *Create virtual private gateway*.
4342
. Give the Virtual Private Gateway a suitable name.
44-
. Select *Custom ASN* and enter the *Amazon side ASN* value gathered previously.
45-
. Create the Virtual Private Gateway.
43+
. Select *Custom ASN* in the *Enter custom ASN* field enter the *Amazon side ASN* value gathered previously.
44+
. Click *Create virtual private gateway*.
4645
. Click the newly created Virtual Private Gateway and choose *Attach to VPC* from the *Actions* tab.
47-
. Select the *{product-title} Cluster VPC* from the list, and attach the Virtual Private Gateway to the VPC.
48-
. From the *Services* menu, click *Direct Connect*. Choose one of the Direct Connect Virtual Interfaces from the list.
49-
. Acknowledge the *I understand that Direct Connect port charges apply once I click Accept Connection* message, then choose *Accept Connection*.
50-
. Choose to *Accept* the Virtual Private Gateway Connection and select the Virtual Private Gateway that was created in the previous steps.
51-
. Select *Accept* to accept the connection.
52-
. Repeat the previous steps if there is more than one Virtual Interface.
46+
. Select the *{product-title} Cluster VPC* from the list, and click *Attach VPC*.
47+
48+
Note: Editing the kubelet config will cause the nodes for your machine pool to be recreated. This ma???
5349

5450
[id="dedicated-aws-dc-hvif-public"]
5551
== Creating a Public Direct Connect
@@ -61,16 +57,10 @@ is Public.
6157

6258
. Log in to the {product-title} AWS Account Dashboard and select the correct region.
6359
. From the {product-title} AWS Account region, select *Direct Connect* from the *Services* menu.
64-
. Select *Direct Connect Gateways* and *Create Direct Connect Gateway*.
65-
. Give the Direct Connect Gateway a suitable name.
60+
. Select *Direct Connect gateways* and *Create Direct Connect gateway*.
61+
. Give the Direct Connect gateway a suitable name.
6662
. In the *Amazon side ASN*, enter the Amazon side ASN value gathered previously.
67-
. Create the Direct Connect Gateway.
68-
. Select *Direct Connect* from the *Services* menu.
69-
. Select one of the Direct Connect Virtual Interfaces from the list.
70-
. Acknowledge the *I understand that Direct Connect port charges apply once I click Accept Connection* message, then choose *Accept Connection*.
71-
. Choose to *Accept* the Direct Connect Gateway Connection and select the Direct Connect Gateway that was created in the previous steps.
72-
. Click *Accept* to accept the connection.
73-
. Repeat the previous steps if there is more than one Virtual Interface.
63+
. Click *Create the Direct Connect gateway*.
7464

7565
[id="dedicated-aws-dc-hvif-verifying"]
7666
== Verifying the Virtual Interfaces

modules/dedicated-aws-vpc-configuring-routing-tables.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ to communicate across the peering connection.
1616
.Procedure
1717

1818
. Log in to the AWS Web Console for the {product-title} AWS Account.
19-
. Navigate to the *VPC Service*, then *Route Tables*.
19+
. Navigate to the *VPC Service*, then *Route tables*.
2020
. Select the Route Table for the {product-title} Cluster VPC.
2121
+
2222
[NOTE]
@@ -36,7 +36,7 @@ Select the private one that has a number of explicitly associated subnets.
3636
.. Select the *Routes* tab, then *Edit*.
3737
.. Enter the {product-title} Cluster VPC CIDR block in the *Destination* text box.
3838
.. Enter the Peering Connection ID in the *Target* text box.
39-
.. Click *Save*.
39+
.. Click *Save changes*.
4040

4141
The VPC peering connection is now complete. Follow the verification procedure to
4242
ensure connectivity across the peering connection is working.

modules/dedicated-aws-vpc-initiating-peering.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ button.
3333
. Verify the details of the account you are logged in to and the details of the
3434
account and VPC you are connecting to:
3535
.. *Peering connection name tag*: Set a descriptive name for the VPC Peering Connection.
36-
.. *VPC (Requester)*: Select the {product-title} Cluster VPC ID from the dropdown
37-
*list.
36+
.. *VPC (Requester)*: Select the {product-title} Cluster VPC ID from the list.
3837
.. *Account*: Select *Another account* and provide the Customer AWS Account number
3938
*(without dashes).
4039
.. *Region*: If the Customer VPC Region differs from the current region, select
41-
*Another Region* and select the customer VPC Region from the dropdown list.
40+
*Another Region* and select the customer VPC Region from the list.
4241
.. *VPC (Accepter)*: Set the Customer VPC ID.
4342
. Click *Create Peering Connection*.
4443
. Confirm that the request enters a *Pending* state. If it enters a *Failed*

modules/dedicated-aws-vpn-creating.adoc

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
[id="dedicated-aws-vpn-creating"]
77
= Creating a VPN connection
88

9-
You can configure an Amazon Web Services (AWS) {product-title} cluster to use a
10-
customer's on-site hardware VPN device using the following procedures.
9+
You can configure an Amazon Web Services (AWS) {product-title} cluster to use a customer's on-site hardware VPN device using the following procedures.
1110

1211
.Prerequisites
1312

@@ -18,44 +17,45 @@ to confirm whether your gateway device is supported by AWS.
1817
* Public, static IP address for the VPN gateway device.
1918
* BGP or static routing: if BGP, the ASN is required. If static routing, you must
2019
configure at least one static route.
21-
* Optional: IP and Port/Protocol of a reachable service to test the VPN connection.
20+
* *Optional*: IP and Port/Protocol of a reachable service to test the VPN connection.
2221
2322
[id="dedicated-aws-vpn-creating-configuring"]
2423
== Configuring the VPN connection
2524

2625
.Procedure
2726

2827
. Log in to the {product-title} AWS Account Dashboard, and navigate to the VPC Dashboard.
29-
. Click on *Your VPCs* and identify the name and VPC ID for the VPC containing the {product-title} cluster.
30-
. From the VPC Dashboard, click *Customer Gateway*.
31-
. Click *Create Customer Gateway* and give it a meaningful name.
32-
. Select the routing method: *Dynamic* or *Static*.
33-
. If Dynamic, enter the BGP ASN in the field that appears.
34-
. Paste in the VPN gateway endpoint IP address.
35-
. Click *Create*.
28+
. Under *Virtual private cloud* click on *Your VPCs* and identify the name and VPC ID for the VPC containing the {product-title} cluster.
29+
. Under *Virtual private network (VPN)* click *Customer gateways*.
30+
. Click *Create customer gateway* and give it a meaningful name.
31+
. Enter the ASN of your customer gateway device in the *BGP ASN* field.
32+
. Enter the IP address for your customer gateway devices’s external interface in the *IP address* field.
33+
. Click *Create customer gateway*.
3634
. If you do not already have a Virtual Private Gateway attached to the intended VPC:
37-
.. From the VPC Dashboard, click on *Virtual Private Gateway*.
38-
.. Click *Create Virtual Private Gateway*, give it a meaningful name, and click *Create*.
39-
.. Leave the default Amazon default ASN.
40-
.. Select the newly created gateway, click *Attach to VPC*, and attach it to the cluster VPC you identified earlier.
35+
.. From the VPC Dashboard, click on *Virtual Private Gateways*.
36+
.. Click *Create virtual private gateway*, give it a meaningful name.
37+
.. Click *Create virtual private gateway*, leaving the *Amazon default ASN*.
38+
.. Select the newly created gateway.
39+
.. Select *Actions* from the list and click *Attach to VPC*.
40+
.. Select the newly created gateway under Available VPC's and click *Attach to VPC* to attach it to the cluster VPC you identified earlier.
4141

4242
[id="dedicated-aws-vpn-creating-establishing"]
4343
== Establishing the VPN Connection
4444

4545
.Procedure
4646

47-
. From the VPC dashboard, click on *Site-to-Site VPN Connections*.
48-
. Click *Create VPN Connection*.
47+
. From the VPC dashboard, under Virtual private network (VPN) click on *Site-to-Site VPN connections*.
48+
. Click *Create VPN connection*.
4949
.. Give it a meaningful name tag.
50-
.. Select the virtual private gateway created previously.
51-
.. For Customer Gateway, select *Existing*.
52-
.. Select the customer gateway device by name.
53-
.. If the VPN will use BGP, select *Dynamic*, otherwise select *Static*. Enter
50+
.. Select the Virtual private gateway created previously.
51+
.. For Customer gateway, select *Existing*.
52+
.. Select the Customer gateway id by name.
53+
.. If the VPN will use BGP, select *Dynamic*, otherwise select *Static* and enter the
5454
Static IP CIDRs. If there are multiple CIDRs, add each CIDR as *Another Rule*.
55-
.. Click *Create*.
56-
.. Wait for VPN status to change to *Available*, approximately 5 to 10 minutes.
57-
. Select the VPN you just created and click *Download Configuration*.
58-
.. From the dropdown list, select the vendor, platform, and version of the customer
55+
.. Click *Create VPN connection*.
56+
.. Under *State* wait for the VPN status to change from *Pending* to *Available*, approximately 5 to 10 minutes.
57+
. Select the VPN you just created and click *Download configuration*.
58+
.. From the list, select the vendor, platform, and version of the customer
5959
gateway device, then click *Download*.
6060
.. The *Generic* vendor configuration is also available for retrieving information
6161
in a plain text format.
@@ -80,7 +80,7 @@ is enabled so that the necessary routes are added to the VPC's route table.
8080

8181
.Procedure
8282

83-
. From the VPC Dashboard, click on *Route Tables*.
83+
. From the VPC Dashboard, under Virtual private cloud, click on *Route tables*.
8484
. Select the private Route table associated with the VPC that contains your
8585
{product-title} cluster.
8686
+
@@ -90,10 +90,9 @@ On some clusters, there may be more than one route table for a particular VPC.
9090
Select the private one that has a number of explicitly associated subnets.
9191
====
9292
. Click on the *Route Propagation* tab.
93-
. In the table that appears, you should see the virtual private gateway you
94-
created previously. Check the value in the *Propagate column*.
95-
.. If Propagate is set to *No*, click *Edit route propagation*, check the Propagate
96-
checkbox next to the virtual private gateway's name and click *Save*.
93+
. In the table that appears, you should see the Virtual Private Gateway you
94+
created previously. Check the value in the *Propagate* column.
95+
.. If *Propagation* is set to *No*, click *Edit route propagation*, check the *Enable* checkbox in Propagation and click *Save*.
9796

9897
After you configure your VPN tunnel and AWS detects it as *Up*, your static or
9998
BGP routes are automatically added to the route table.

modules/dedicated-aws-vpn-verifying.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ working.
1616
1717
.Procedure
1818

19-
. *Verify the tunnel is up in AWS.*
19+
. *Verify the tunnel is up in AWS*.
2020

21-
.. From the VPC Dashboard, click on *VPN Connections*.
22-
.. Select the VPN connection you created previously and click the *Tunnel Details* tab.
23-
.. You should be able to see that at least one of the VPN tunnels is *Up*.
21+
.. From the VPC Dashboard, under *Virtual private network (VPN)*, click on *Site-to-Site VPN connections*.
22+
.. Select the VPN connection you created previously and click the *Tunnel details* tab.
23+
.. You should see that at least one of the VPN tunnels is in an *Up* status.
2424

25-
. *Verify the connection.*
25+
. *Verify the connection*.
2626
+
2727
To test network connectivity to an endpoint device, `nc` (or `netcat`) is a
2828
helpful troubleshooting tool. It is included in the default image and provides

modules/machine-pools-hcp.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ In {hcp-title} clusters, the hosted control plane spans three availability zones
1010

1111
Each machine pool in an {hcp-title} cluster upgrades independently. Because the machine pools upgrade independently, they must remain within 2 minor (Y-stream) versions of the hosted control plane. For example, if your hosted control plane is 4.16.z, your machine pools must be at least 4.14.z.
1212

13-
The following image depicts how machine pools work within ROSA and {hcp-title} clusters:
13+
The following image depicts how machine pools work within ROSA and {product-title} clusters:
1414

15-
image::hcp-rosa-machine-pools.png[Machine pools on ROSA classic and {hcp-title} clusters]
15+
image::hcp-rosa-machine-pools.png[Machine pools on ROSA classic and {product-title} clusters]
1616

1717
[NOTE]
1818
====

modules/nodes-cluster-resource-configure-oom.adoc

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ follows:
2424
+
2525
[source,terminal]
2626
----
27-
# oc rsh test
27+
# oc rsh <pod name>
2828
----
2929

3030
. Run the following command to see the current OOM kill count in `/sys/fs/cgroup/memory/memory.oom_control`:
@@ -53,21 +53,6 @@ $ sed -e '' </dev/zero
5353
Killed
5454
----
5555

56-
. Run the following command to view the exit status of the `sed` command:
57-
+
58-
[source,terminal]
59-
----
60-
$ echo $?
61-
----
62-
+
63-
.Example output
64-
[source,terminal]
65-
----
66-
137
67-
----
68-
+
69-
The `137` code indicates the container process exited with code 137, indicating it received a SIGKILL signal.
70-
7156
. Run the following command to see that the OOM kill counter in `/sys/fs/cgroup/memory/memory.oom_control` incremented:
7257
+
7358
[source,terminal]
@@ -86,7 +71,7 @@ exits, whether immediately or not, it will have phase *Failed* and reason
8671
*OOMKilled*. An OOM-killed pod might be restarted depending on the value of
8772
`restartPolicy`. If not restarted, controllers such as the replication controller will notice the pod's failed status and create a new pod to replace the old one.
8873
+
89-
Use the follwing command to get the pod status:
74+
Use the following command to get the pod status:
9075
+
9176
[source,terminal]
9277
----

modules/nodes-cluster-resource-configure-request-limit.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
[id="nodes-cluster-resource-configure-request-limit_{context}"]
77
= Finding the memory request and limit from within a pod
88

9-
An application wishing to dynamically discover its memory request and limit from
10-
within a pod should use the Downward API.
9+
An application wishing to dynamically discover its memory request and limit from within a pod should use the Downward API.
1110

1211
.Procedure
1312

@@ -23,7 +22,7 @@ metadata:
2322
name: test
2423
spec:
2524
securityContext:
26-
runAsNonRoot: true
25+
runAsNonRoot: false
2726
seccompProfile:
2827
type: RuntimeDefault
2928
containers:

0 commit comments

Comments
 (0)