Skip to content

Commit

Permalink
Merge pull request #66277 from bergerhoffer/more-typos
Browse files Browse the repository at this point in the history
Fixing a few typos
  • Loading branch information
bergerhoffer authored Oct 17, 2023
2 parents ec5b072 + ac28280 commit 7c64dcf
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
18 changes: 9 additions & 9 deletions cloud_experts_tutorials/cloud-experts-entra-id-idp.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ toc::[]
// - Paul Czarkowski
// ---

This tutorial demonstrates how to configure Microsoft Entra ID (formerly Azure Active Directory) as the cluster identity provider in {product-title} (ROSA). This tutorial walks through the creation of an Microsoft Entra ID (Entra ID) application and configure Red Hat OpenShift Service on AWS (ROSA) to authenticate using Azure AD.
This tutorial demonstrates how to configure Microsoft Entra ID (formerly Azure Active Directory) as the cluster identity provider in {product-title} (ROSA). This tutorial walks through the creation of an Microsoft Entra ID (Entra ID) application and configure Red Hat OpenShift Service on AWS (ROSA) to authenticate using Azure AD.

This tutorial walks through the following steps:

Expand All @@ -37,7 +37,7 @@ Create a set of security groups and assign users by following link:https://learn
+
First, construct the cluster's OAuth callback URL and make note of it. To do so, run the following command, making sure to replace the variable specified:
+
The "AAD" directory at the end of the the OAuth callback URL should match the OAuth identity provider name you'll setup later.
The "AAD" directory at the end of the OAuth callback URL should match the OAuth identity provider name you'll setup later.
+
[source,terminal]
----
Expand Down Expand Up @@ -85,7 +85,7 @@ image:azure-portal_add-optional-claims-graph-permissions-prompt.png[Azure Portal
[id="rosa-mobb-entra-id-configure-group-claims"]
== Configure group claims (optional)

In addition to individual user authentication, OpenShift provides group claim functionality. This functionality allows an OpenID Connect identity provider, like Entra ID, to offer a user’s group membership for use within OpenShift. To enable group claims, we will configure Entra ID to provide a groups claim.
In addition to individual user authentication, OpenShift provides group claim functionality. This functionality allows an OpenID Connect identity provider, like Entra ID, to offer a user’s group membership for use within OpenShift. To enable group claims, we will configure Entra ID to provide a groups claim.

Next, select the "Add groups claim" button.

Expand Down Expand Up @@ -129,8 +129,8 @@ $ rosa create idp \
--cluster ${CLUSTER_NAME} \
--type openid \
--name ${IDP_NAME} \
--client-id ${APP_ID} \
--client-secret ${CLIENT_SECRET} \
--client-id ${APP_ID} \
--client-secret ${CLIENT_SECRET} \
--issuer-url https://login.microsoftonline.com/${TENANT_ID}/v2.0 \
--email-claims email \
--name-claims name \
Expand All @@ -147,8 +147,8 @@ $ rosa create idp \
--cluster ${CLUSTER_NAME} \
--type openid \
--name ${IDP_NAME} \
--client-id ${APP_ID} \
--client-secret ${CLIENT_SECRET} \
--client-id ${APP_ID} \
--client-secret ${CLIENT_SECRET} \
--issuer-url https://login.microsoftonline.com/${TENANT_ID}/v2.0 \
--email-claims email \
--name-claims name \
Expand All @@ -159,7 +159,7 @@ $ rosa create idp \
[id="rosa-mobb-azure-oidc-grant-permissions"]
== Grant additional permissions to individual users

Once the cluster authentication Operator reconciles your changes (generally within a few minutes), you will be able to log in to the cluster using Entra ID.
Once the cluster authentication Operator reconciles your changes (generally within a few minutes), you will be able to log in to the cluster using Entra ID.

Once you log in, you will notice that you have very limited permissions. This is because, by default, OpenShift only grants you the ability to create new projects (namespaces) in the cluster. Other projects (namespaces) are restricted from view.

Expand Down Expand Up @@ -194,4 +194,4 @@ $ oc create clusterrolebinding cluster-admin-group \

Now, any user in the specified group will automatically be granted `cluster-admin` access.

For more information on how to use RBAC to define and apply permissions in OpenShift, see link:https://docs.openshift.com/container-platform/latest/authentication/using-rbac.html[the OpenShift documentation].
For more information on how to use RBAC to define and apply permissions in OpenShift, see link:https://docs.openshift.com/container-platform/latest/authentication/using-rbac.html[the OpenShift documentation].
10 changes: 5 additions & 5 deletions modules/installing-gcp-user-defined-labels-and-tags.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
:FeatureName: Support for user-defined labels and tags for GCP
include::snippets/technology-preview.adoc[]

Google Cloud Platform (GCP) provides labels and tags that help to identify and organize the resources created for a specific {product-title} cluster, making them easier to manage.
Google Cloud Platform (GCP) provides labels and tags that help to identify and organize the resources created for a specific {product-title} cluster, making them easier to manage.

You can define labels and tags for each GCP resource only during {product-title} cluster installation.
You can define labels and tags for each GCP resource only during {product-title} cluster installation.

[IMPORTANT]
====
Expand All @@ -19,7 +19,7 @@ User-defined labels and tags are not supported for {product-title} clusters upgr

.User-defined labels

User-defined labels and {product-title} specific labels are applied only to resources created by {product-title} installation program and its core components such as:
User-defined labels and {product-title} specific labels are applied only to resources created by {product-title} installation program and its core components such as:

* GCP filestore CSI Driver Operator
* GCP PD CSI Driver Operator
Expand All @@ -46,7 +46,7 @@ User-defined labels and {product-title} labels are available on the following GC

User-defined tags are attached to resources created by the {product-title} Image Registry Operator and not on the resources created by any other Operators or the Kubernetes in-tree components.

User-defined tags are available on on the following GCP resources:
User-defined tags are available on the following GCP resources:
* Storage bucket

.Limitations to the user-defined tags
Expand All @@ -57,7 +57,7 @@ User-defined tags are available on on the following GCP resources:
** Filestore instance resources created by the GCP filestore CSI driver Operator
** Compute disk and compute image resources created by the GCP PD CSI driver Operator
* Tags are not supported for buckets located in the following regions:
** `us-east2`
** `us-east2`
** `us-east3`
* Image Registry Operator does not throw any error but skips processing tags when the buckets are created in the tags unsupported region.
* Tags must not be restricted to particular service accounts, because Operators create and use service accounts with minimal roles.
Expand Down
3 changes: 1 addition & 2 deletions modules/microshift-preparing-to-make-app-rpms.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[id="microshift-preparing-to-make-app-rpms_{context}"]
= Preparing to make application RPMs

To build your own RPMs, choose a tool of your choice, such as the the `rpmbuild` tool, and initialize the RPM build tree in your home directory. The following is an example procedure. As long as your RPMs are accessible to Image Builder, you can use the method you prefer to build the application RPMs.
To build your own RPMs, choose a tool of your choice, such as the `rpmbuild` tool, and initialize the RPM build tree in your home directory. The following is an example procedure. As long as your RPMs are accessible to Image Builder, you can use the method you prefer to build the application RPMs.

.Prerequisites

Expand Down Expand Up @@ -43,4 +43,3 @@ $ ls ~/rpmbuild/
----
BUILD RPMS SOURCES SPECS SRPMS
----
4 changes: 2 additions & 2 deletions modules/ovn-kubernetes-architecture-con.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ The OVN northbound database contains the current desired state of the network, p
The `ovn-northd` (`northd` container) connects to the OVN northbound database and the OVN southbound database.
It translates the logical network configuration in terms of conventional network concepts, taken from the OVN northbound database, into logical data path flows in the OVN southbound database.

The OVN southbound database has physical and logical representations of the network and binding tables that link them together. It contains the chassis information of the node and other constructs like remote transit switch ports that are required to to connect to the other nodes in the cluster. The OVN southbound database also contains all the logic flows. The logic flows are shared with the `ovn-controller` process that runs on each node and the `ovn-controller` turns those into `OpenFlow` rules to program `Open vSwitch`(OVS).
The OVN southbound database has physical and logical representations of the network and binding tables that link them together. It contains the chassis information of the node and other constructs like remote transit switch ports that are required to connect to the other nodes in the cluster. The OVN southbound database also contains all the logic flows. The logic flows are shared with the `ovn-controller` process that runs on each node and the `ovn-controller` turns those into `OpenFlow` rules to program `Open vSwitch`(OVS).

The Kubernetes control plane nodes each contain an `ovnkube-control-plane` pod which does the central IP address management (IPAM) allocation for each node in the cluster. At any given time a single `ovnkube-control-plane` pod is the leader.
The Kubernetes control plane nodes each contain an `ovnkube-control-plane` pod which does the central IP address management (IPAM) allocation for each node in the cluster. At any given time a single `ovnkube-control-plane` pod is the leader.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You can create a Windows `MachineSet` object to serve a specific purpose in your
* You installed the Windows Machine Config Operator (WMCO) using Operator Lifecycle Manager (OLM).
* You are using a supported Windows Server as the operating system image.
+
Use one of the the following `aws` commands, as appropriate for your Windows Server release, to query valid AMI images:
Use one of the following `aws` commands, as appropriate for your Windows Server release, to query valid AMI images:
+
.Example Windows Server 2022 command
+
Expand Down

0 comments on commit 7c64dcf

Please sign in to comment.