Skip to content

Commit 51cdac6

Browse files
authored
Merge pull request #87138 from xenolinux/use-hcp-attr
OSDOCS#13131: Updated hosted control planes with its attributes
2 parents 39ae593 + ac74aeb commit 51cdac6

16 files changed

+32
-32
lines changed

hosted_control_planes/hcp-deploy/hcp-deploy-ibm-power.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
You can deploy hosted control planes by configuring a cluster to function as a hosting cluster. The hosting cluster is an {product-title} cluster where the control planes are hosted. The hosting cluster is also known as the _management_ cluster.
9+
You can deploy {hcp} by configuring a cluster to function as a hosting cluster. The hosting cluster is an {product-title} cluster where the control planes are hosted. The hosting cluster is also known as the _management_ cluster.
1010

1111
[NOTE]
1212
====

hosted_control_planes/hcp-disconnected/hcp-deploy-dc-bm.adoc

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

77
toc::[]
88

9-
When you provision hosted control planes on bare metal, you use the Agent platform. The Agent platform and {mce} work together to enable disconnected deployments. The Agent platform uses the central infrastructure management service to add worker nodes to a hosted cluster. For an introduction to the central infrastructure management service, see link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.12/html/clusters/cluster_mce_overview#enable-cim[Enabling the central infrastructure management service].
9+
When you provision {hcp} on bare metal, you use the Agent platform. The Agent platform and {mce} work together to enable disconnected deployments. The Agent platform uses the central infrastructure management service to add worker nodes to a hosted cluster. For an introduction to the central infrastructure management service, see link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.12/html/clusters/cluster_mce_overview#enable-cim[Enabling the central infrastructure management service].
1010

1111
include::modules/hcp-dc-bm-arch.adoc[leveloffset=+1]
1212
include::modules/hcp-dc-bm-reqs.adoc[leveloffset=+1]
@@ -51,4 +51,4 @@ include::modules/hcp-nodepool-hc.adoc[leveloffset=+2]
5151
include::modules/hcp-dc-infraenv.adoc[leveloffset=+2]
5252
include::modules/hcp-worker-hc.adoc[leveloffset=+2]
5353
include::modules/hcp-bm-hosts.adoc[leveloffset=+2]
54-
include::modules/hcp-dc-scale-np.adoc[leveloffset=+2]
54+
include::modules/hcp-dc-scale-np.adoc[leveloffset=+2]

hosted_control_planes/hcp-prepare/hcp-distribute-workloads.adoc

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

77
toc::[]
88

9-
Before you get started with hosted control planes for {product-title}, you must properly label nodes so that the pods of hosted clusters can be scheduled into infrastructure nodes. Node labeling is also important for the following reasons:
9+
Before you get started with {hcp} for {product-title}, you must properly label nodes so that the pods of hosted clusters can be scheduled into infrastructure nodes. Node labeling is also important for the following reasons:
1010

1111
* To ensure high availability and proper workload deployment. For example, you can set the `node-role.kubernetes.io/infra` label to avoid having the control-plane workload count toward your {product-title} subscription.
1212
* To ensure that control plane workloads are separate from other workloads in the management cluster.
1313
//lahinson - sept. 2023 - commenting out the following lines until those levels are supported for self-managed hypershift
1414
//* To ensure that control plane workloads are configured at one of the following multi-tenancy distribution levels:
1515
//** Everything shared: Control planes for hosted clusters can run on any node that is designated for control planes.
1616
//** Request serving isolation: Serving pods are requested in their own dedicated nodes.
17-
//** Nothing shared: Every control plane has its own dedicated nodes.
17+
//** Nothing shared: Every control plane has its own dedicated nodes.
1818
1919
[IMPORTANT]
2020
====
@@ -23,4 +23,4 @@ Do not use the management cluster for your workload. Workloads must not run on n
2323

2424
include::modules/hcp-labels-taints.adoc[leveloffset=+1]
2525
include::modules/hcp-priority-classes.adoc[leveloffset=+1]
26-
include::modules/hcp-virt-taints-tolerations.adoc[leveloffset=+1]
26+
include::modules/hcp-virt-taints-tolerations.adoc[leveloffset=+1]

hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc

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

77
toc::[]
88

9-
Many factors, including hosted cluster workload and worker node count, affect how many hosted control planes can fit within a certain number of worker nodes. Use this sizing guide to help with hosted cluster capacity planning. This guidance assumes a highly available {hcp} topology. The load-based sizing examples were measured on a bare-metal cluster. Cloud-based instances might have different limiting factors, such as memory size.
9+
Many factors, including hosted cluster workload and worker node count, affect how many {hcp} can fit within a certain number of worker nodes. Use this sizing guide to help with hosted cluster capacity planning. This guidance assumes a highly available {hcp} topology. The load-based sizing examples were measured on a bare-metal cluster. Cloud-based instances might have different limiting factors, such as memory size.
1010

1111
You can override the following resource utilization sizing measurements and disable the metric service monitoring.
1212

@@ -38,4 +38,4 @@ include::modules/hcp-shared-infra.adoc[leveloffset=+1]
3838
[role="_additional-resources"]
3939
.Additional resources
4040

41-
* xref:../../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc[Sizing guidance for {hcp}]
41+
* xref:../../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc[Sizing guidance for {hcp}]

hosted_control_planes/hcp_high_availability/about-hcp-ha.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="about-hcp-ha"]
3-
= About high availability for hosted control planes
43
include::_attributes/common-attributes.adoc[]
4+
= About high availability for {hcp}
55
:context: about-hcp-ha
66

77
toc::[]
88

9-
You can maintain high availability (HA) of hosted control planes by implementing the following actions:
9+
You can maintain high availability (HA) of {hcp} by implementing the following actions:
1010

1111
* Recover etcd members for a hosted cluster.
1212
* Back up and restore etcd for a hosted cluster.

hosted_control_planes/hcp_high_availability/hcp-disaster-recovery-oadp.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You must meet the following prerequisites on the management cluster:
2626
* You have access to the {oadp-short} subscription through a catalog source.
2727
* You have access to a cloud storage provider that is compatible with {oadp-short}, such as S3, {azure-full}, {gcp-full}, or MinIO.
2828
* In a disconnected environment, you have access to a self-hosted storage provider, for example link:https://docs.redhat.com/en/documentation/red_hat_openshift_data_foundation/[{odf-full}] or link:https://min.io/[MinIO], that is compatible with {oadp-short}.
29-
* Your hosted control planes pods are up and running.
29+
* Your {hcp} pods are up and running.
3030

3131
[id="prepare-aws-oadp_{context}"]
3232
== Preparing {aws-short} to use {oadp-short}

modules/hcp-enable-manual-addon.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
[id="hcp-enable-manual-addon_{context}"]
66
= Manually enabling the hypershift-addon managed cluster add-on for local-cluster
77

8-
Enabling the hosted control planes feature automatically enables the `hypershift-addon` managed cluster add-on. If you need to enable the `hypershift-addon` managed cluster add-on manually, complete the following steps to use the `hypershift-addon` to install the HyperShift Operator on `local-cluster`.
8+
Enabling the {hcp} feature automatically enables the `hypershift-addon` managed cluster add-on. If you need to enable the `hypershift-addon` managed cluster add-on manually, complete the following steps to use the `hypershift-addon` to install the HyperShift Operator on `local-cluster`.
99

1010
.Procedure
1111

12-
. Create the `ManagedClusterAddon` HyperShift add-on by creating a file that resembles the following example:
12+
. Create the `ManagedClusterAddon` add-on named `hypershift-addon` by creating a file that resembles the following example:
1313
+
1414
[source,yaml]
1515
----
1616
apiVersion: addon.open-cluster-management.io/v1alpha1
1717
kind: ManagedClusterAddOn
1818
metadata:
1919
name: hypershift-addon
20-
namespace: local-cluster
20+
namespace: local-cluster
2121
spec:
2222
installNamespace: open-cluster-management-agent-addon
2323
----
@@ -29,9 +29,9 @@ spec:
2929
$ oc apply -f <filename>
3030
----
3131
+
32-
Replace `filename` with the name of the file that you created.
32+
Replace `filename` with the name of the file that you created.
3333

34-
. Confirm that the `hypershift-addon` is installed by running the following command:
34+
. Confirm that the `hypershift-addon` managed cluster add-on is installed by running the following command:
3535
+
3636
[source,terminal]
3737
----
@@ -46,4 +46,4 @@ NAME AVAILABLE DEGRADED PROGRESSING
4646
hypershift-addon True
4747
----
4848

49-
Your HyperShift add-on is installed and the hosting cluster is available to create and manage hosted clusters.
49+
Your `hypershift-addon` managed cluster add-on is installed and the hosting cluster is available to create and manage hosted clusters.

modules/hcp-ibm-z-dns.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ api-int IN A 1xx.2x.2xx.1xx
3737
;
3838
;EOF
3939
----
40-
<1> The record refers to the IP address of the API load balancer that handles ingress and egress traffic for hosted control planes.
40+
<1> The record refers to the IP address of the API load balancer that handles ingress and egress traffic for {hcp}.
4141

4242
For {ibm-title} z/VM, add IP addresses that correspond to the IP address of the agent.
4343

4444
[source,terminal]
4545
----
4646
compute-0 IN A 1xx.2x.2xx.1yy
4747
compute-1 IN A 1xx.2x.2xx.1yy
48-
----
48+
----

modules/hcp-labels-taints.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="hcp-labels-taints_{context}"]
77
= Labeling management cluster nodes
88

9-
Proper node labeling is a prerequisite to deploying hosted control planes.
9+
Proper node labeling is a prerequisite to deploying {hcp}.
1010

1111
As a management cluster administrator, you use the following labels and taints in management cluster nodes to schedule a control plane workload:
1212

@@ -30,7 +30,7 @@ $ oc label node/worker-2a node/worker-2b topology.kubernetes.io/zone=rack2
3030
3131
Pods for a hosted cluster have tolerations, and the scheduler uses affinity rules to schedule them. Pods tolerate taints for `control-plane` and the `cluster` for the pods. The scheduler prioritizes the scheduling of pods into nodes that are labeled with `hypershift.openshift.io/control-plane` and `hypershift.openshift.io/cluster: ${HostedControlPlane Namespace}`.
3232

33-
For the `ControllerAvailabilityPolicy` option, use `HighlyAvailable`, which is the default value that the hosted control planes command line interface, `hcp`, deploys. When you use that option, you can schedule pods for each deployment within a hosted cluster across different failure domains by setting `topology.kubernetes.io/zone` as the topology key. Control planes that are not highly available are not supported.
33+
For the `ControllerAvailabilityPolicy` option, use `HighlyAvailable`, which is the default value that the {hcp} command-line interface, `hcp`, deploys. When you use that option, you can schedule pods for each deployment within a hosted cluster across different failure domains by setting `topology.kubernetes.io/zone` as the topology key. Control planes that are not highly available are not supported.
3434

3535
.Procedure
3636

@@ -43,4 +43,4 @@ To enable a hosted cluster to require its pods to be scheduled into infrastructu
4343
role.kubernetes.io/infra: ""
4444
----
4545

46-
This way, hosted control planes for each hosted cluster are eligible infrastructure node workloads, and you do not need to entitle the underlying {product-title} nodes.
46+
This way, {hcp} for each hosted cluster are eligible infrastructure node workloads, and you do not need to entitle the underlying {product-title} nodes.

modules/hcp-managed-aws-infra-mgmt.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="hcp-managed-aws-infra-mgmt_{context}"]
77
= Infrastructure requirements for a management {aws-short} account
88

9-
When your infrastructure is managed by hosted control planes in a management AWS account, the infrastructure requirements differ depending on whether your clusters are public, private, or a combination.
9+
When your infrastructure is managed by {hcp} in a management AWS account, the infrastructure requirements differ depending on whether your clusters are public, private, or a combination.
1010

1111
For accounts with public clusters, the infrastructure requirements are as follows:
1212

0 commit comments

Comments
 (0)