Skip to content

Commit 32ef915

Browse files
authored
Merge pull request #75543 from mletalie/OSDOCS-10334
[OSDOCS-10464] Remove HCP references in OSD docs
2 parents 1bcfb11 + 574baa6 commit 32ef915

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,13 @@ Alternatively, you can add the node labels and taints after you create the machi
101101
ifdef::openshift-rosa,openshift-dedicated[]
102102
. Optional: Select additional custom security groups to use for nodes in this machine pool. You must have already created the security groups and associated them with the VPC that you selected for this cluster. You cannot add or edit security groups after you create the machine pool. For more information, see the requirements for security groups in the "Additional resources" section.
103103
+
104+
endif::openshift-rosa,openshift-dedicated[]
105+
ifdef::openshift-rosa[]
104106
[IMPORTANT]
105107
====
106-
You can use up to ten additional security groups for machine pools on {hcp-title} clusters.
108+
You can use up to ten additional security groups for machine pools on {hcp-title} clusters.
107109
====
108-
endif::openshift-rosa,openshift-dedicated[]
109-
110+
endif::openshift-rosa[]
110111
ifdef::openshift-dedicated[]
111112
. Optional: If you deployed {product-title} on AWS using the Customer Cloud Subscription (CCS) model, use Amazon EC2 Spot Instances if you want to configure your machine pool to deploy machines as non-guaranteed AWS Spot Instances:
112113
.. Select *Use Amazon EC2 Spot Instances*.

modules/openshift-architecture-common-terms.adoc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ admission plugins::
1515
Admission plugins enforce security policies, resource limitations, or configuration requirements.
1616

1717
authentication::
18-
// The following variations have only minor differences, but are separated for
19-
// maintainability.
18+
// The following variations have only minor differences, but are separated for maintainability.
2019
ifndef::openshift-dedicated,openshift-rosa[]
2120
To control access to an {product-title} cluster, a cluster administrator can configure user authentication to ensure only approved users access the cluster. To interact with an {product-title} cluster, you must authenticate with the {product-title} API. You can authenticate by providing an OAuth access token or an X.509 client certificate in your requests to the {product-title} API.
2221
endif::openshift-dedicated,openshift-rosa[]
@@ -65,14 +64,24 @@ A Kubernetes resource object that maintains the life cycle of an application.
6564

6665
Dockerfile::
6766
A text file that contains the user commands to perform on a terminal to assemble the image.
67+
ifdef::openshift-rosa[]
68+
hosted control planes::
69+
A {product-title} feature that enables hosting a control plane on the {product-title} cluster from its data plane and workers. This model performs the following actions:
6870

71+
* Optimize infrastructure costs required for the control planes.
72+
* Improve the cluster creation time.
73+
* Enable hosting the control plane using the Kubernetes native high level primitives. For example, deployments and stateful sets.
74+
* Allow a strong network segmentation between the control plane and workloads.
75+
endif::openshift-rosa[]
76+
ifndef::openshift-dedicated,openshift-rosa[]
6977
hosted control planes::
7078
A {product-title} feature that enables hosting a control plane on the {product-title} cluster from its data plane and workers. This model performs the following actions:
7179
7280
* Optimize infrastructure costs required for the control planes.
7381
* Improve the cluster creation time.
7482
* Enable hosting the control plane using the Kubernetes native high level primitives. For example, deployments and stateful sets.
7583
* Allow a strong network segmentation between the control plane and workloads.
84+
endif::openshift-dedicated,openshift-rosa[]
7685
7786
hybrid cloud deployments::
7887
Deployments that deliver a consistent platform across bare metal, virtual, private, and public cloud environments. This offers speed, agility, and portability.
@@ -134,7 +143,7 @@ For clusters with internet access, {op-system-base-full} provides over-the-air u
134143
A registry provided by {product-title} to manage images.
135144

136145
Operator::
137-
The preferred method of packaging, deploying, and managing a Kubernetes application in
146+
The preferred method of packaging, deploying, and managing a Kubernetes application in
138147
ifdef::openshift-rosa[]
139148
a
140149
endif::openshift-rosa[]

0 commit comments

Comments
 (0)