Skip to content

Commit 825d62b

Browse files
committed
CQA for authentication
1 parent 4111de6 commit 825d62b

26 files changed

Lines changed: 80 additions & 113 deletions

authentication/assuming-an-aws-iam-role-for-a-service-account.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="assuming-an-aws-iam-role-for-a-service-account"]
3-
= Assuming an AWS IAM role for a service account
3+
= Assume an AWS IAM role for a service account
44

55
include::_attributes/common-attributes.adoc[]
66
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
@@ -34,7 +34,7 @@ include::modules/deploying-a-pod-that-includes-an-aws-sdk.adoc[leveloffset=+2]
3434
include::modules/verifying-the-assumed-iam-role-in-your-pod.adoc[leveloffset=+2]
3535

3636
[role="_additional-resources"]
37-
[id="additional-resources_configuring-alert-notifications"]
37+
[id="additional-resources_assuming-an-aws-iam-role-for-a-service-account"]
3838
== Additional resources
3939

4040
* link:https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html[AWS documentation on IAM roles for service accounts]

authentication/osd-admin-roles.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="osd-admin-roles"]
3-
= Managing administration roles and users
3+
= Manage administration roles and users
44
include::_attributes/attributes-openshift-dedicated.adoc[]
55

66
:context: osd-admin-roles

authentication/osd-revoking-cluster-privileges.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="osd-revoking-cluster-privileges"]
3-
= Revoking privileges and access to an {product-title} cluster
3+
= Revoke privileges and access to an {product-title} cluster
44

55
include::_attributes/attributes-openshift-dedicated.adoc[]
66
:context: osd-revoking-cluster-privileges

authentication/sd-configuring-identity-providers.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ include::modules/config-htpasswd-idp-webui.adoc[leveloffset=+2]
2626
include::modules/config-htpasswd-idp-from-file.adoc[leveloffset=+2]
2727
ifdef::openshift-rosa-hcp,openshift-rosa[]
2828
include::modules/rosa-config-htpasswd-idp-cli.adoc[leveloffset=+2]
29-
include::modules/rosa-config-htpasswd-idp-cli-file.adoc[leveloffset=+3]
29+
include::modules/rosa-config-htpasswd-idp-cli-file.adoc[leveloffset=+2]
3030
include::modules/config-htpasswd-idp-terraform.adoc[leveloffset=+2]
3131
endif::openshift-rosa-hcp,openshift-rosa[]
3232
ifdef::openshift-dedicated[]
@@ -43,5 +43,5 @@ ifdef::openshift-rosa[]
4343
* xref:../rosa_getting_started/rosa-sts-getting-started-workflow.adoc#rosa-sts-understanding-the-deployment-workflow[Understanding the ROSA with STS deployment workflow]
4444
endif::openshift-rosa[]
4545
* link:https://httpd.apache.org/docs/current/misc/password_encryptions.html[Apache Password Formats]
46-
* link:https://developers.google.com/identity/protocols/OpenIDConnect[Google's OpenID Connect integration]
47-
* link:http://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth[Authorization Code Flow]
46+
* link:https://developers.google.com/identity/protocols/OpenIDConnect[Google OpenID Connect integration]
47+
* link:https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth[Authorization Code Flow]

modules/assuming-an-aws-iam-role-in-your-own-pods.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_mod-docs-content-type: CONCEPT
66
[id="assuming-an-aws-iam-role-in-your-own-pods_{context}"]
7-
= Assuming an AWS IAM role in your own pods
7+
= Assume an AWS IAM role in your own pods
88

99
[role="_abstract"]
1010
You can enable a service account to assume an AWS Identity and Access Management (IAM) role in a pod deployed in a user-defined project.

modules/config-github-idp.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="config-github-idp_{context}"]
8-
= Configuring a GitHub identity provider
8+
= Configure a GitHub identity provider
99

1010
[role="_abstract"]
11-
Configure a GitHub identity provider to validate user names and passwords against GitHub or GitHub Enterprise's OAuth authentication server and access your {product-title} cluster. OAuth facilitates a token exchange flow between {product-title} and GitHub or GitHub Enterprise.
11+
Configure a GitHub identity provider to validate user names and passwords against the GitHub or GitHub Enterprise OAuth authentication server and access your {product-title} cluster. OAuth facilitates a token exchange flow between {product-title} and GitHub or GitHub Enterprise.
1212

1313
[WARNING]
1414
====
@@ -17,7 +17,7 @@ Configuring GitHub authentication allows users to log in to {product-title} with
1717

1818
.Prerequisites
1919

20-
* The OAuth application must be created directly within the GitHub link:https://docs.github.com/en/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings[organization settings] by the GitHub organization administrator.
20+
* The OAuth application is created directly within the GitHub link:https://docs.github.com/en/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings[organization settings] by the GitHub organization administrator.
2121
* link:https://docs.github.com/en/github/setting-up-and-managing-organizations-and-teams[GitHub organizations or teams] are set up in your GitHub account.
2222
2323
.Procedure
@@ -30,13 +30,13 @@ Configuring GitHub authentication allows users to log in to {product-title} with
3030
+
3131
[NOTE]
3232
====
33-
You can also click the *Add Oauth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
33+
You can also click the *Add OAuth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
3434
====
3535

3636
. Select *GitHub* from the drop-down menu.
3737

3838
. Enter a unique name for the identity provider. This name cannot be changed later.
39-
** An *OAuth callback URL* is automatically generated in the provided field. You will use this to register the GitHub application.
39+
** An *OAuth callback URL* is automatically generated in the provided field. Use this to register the GitHub application.
4040
+
4141
----
4242
https://oauth-openshift.apps.<cluster_name>.<cluster_domain>/oauth2callback/<idp_provider_name>

modules/config-gitlab-idp.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="config-gitlab-idp_{context}"]
8-
= Configuring a GitLab identity provider
8+
= Configure a GitLab identity provider
99

1010
[role="_abstract"]
11-
Configure a GitLab identity provider to use link:https://gitlab.com/[GitLab.com] or any other GitLab instance as an identity provider.
11+
Configure a GitLab identity provider to use GitLab.com or any other GitLab instance as an identity provider so that users can log in to your cluster with their GitLab credentials.
1212

1313
.Prerequisites
1414

15-
- If you use GitLab version 7.7.0 to 11.0, you connect using the link:http://doc.gitlab.com/ce/integration/oauth_provider.html[OAuth integration]. If you use GitLab version 11.1 or later, you can use link:https://docs.gitlab.com/ce/integration/openid_connect_provider.html[OpenID Connect] (OIDC) to connect instead of OAuth.
15+
* If you use GitLab version 7.7.0 to 11.0, you connect using the link:https://docs.gitlab.com/ee/integration/oauth_provider.html[OAuth integration]. If you use GitLab version 11.1 or later, you can use link:https://docs.gitlab.com/ee/integration/openid_connect_provider.html[OpenID Connect] (OIDC) to connect instead of OAuth.
1616
1717
.Procedure
1818

@@ -24,13 +24,13 @@ Configure a GitLab identity provider to use link:https://gitlab.com/[GitLab.com]
2424
+
2525
[NOTE]
2626
====
27-
You can also click the *Add Oauth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
27+
You can also click the *Add OAuth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
2828
====
2929

3030
. Select *GitLab* from the drop-down menu.
3131

3232
. Enter a unique name for the identity provider. This name cannot be changed later.
33-
** An *OAuth callback URL* is automatically generated in the provided field. You will provide this URL to GitLab.
33+
** An *OAuth callback URL* is automatically generated in the provided field. Provide this URL to GitLab.
3434
+
3535
ifndef::openshift-rosa-hcp[]
3636
----

modules/config-google-idp.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="config-google-idp_{context}"]
8-
= Configuring a Google identity provider
8+
= Configure a Google identity provider
99

1010
[role="_abstract"]
1111
Configure a Google identity provider to allow users to authenticate with their Google credentials.
1212

1313
[WARNING]
1414
====
15-
Using Google as an identity provider allows any Google user to authenticate to your server.
16-
You can limit authentication to members of a specific hosted domain with the
15+
Using Google as an identity provider allows any Google user to authenticate to your server. You can limit authentication to members of a specific hosted domain with the
1716
`hostedDomain` configuration attribute.
1817
====
1918

@@ -27,13 +26,13 @@ You can limit authentication to members of a specific hosted domain with the
2726
+
2827
[NOTE]
2928
====
30-
You can also click the *Add Oauth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
29+
You can also click the *Add OAuth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
3130
====
3231

3332
. Select *Google* from the drop-down menu.
3433

3534
. Enter a unique name for the identity provider. This name cannot be changed later.
36-
** An *OAuth callback URL* is automatically generated in the provided field. You will provide this URL to Google.
35+
** An *OAuth callback URL* is automatically generated in the provided field. Provide this URL to Google.
3736
+
3837
ifndef::openshift-rosa-hcp[]
3938
----
@@ -52,7 +51,7 @@ For example:
5251
https://oauth-openshift.apps.openshift-cluster.example.com/oauth2callback/google
5352
----
5453

55-
. Configure a Google identity provider using link:https://developers.google.com/identity/protocols/OpenIDConnect[Google's OpenID Connect integration].
54+
. Configure a Google identity provider using link:https://developers.google.com/identity/protocols/OpenIDConnect[Google OpenID Connect integration].
5655

5756
. Return to {product-title} and select a mapping method from the drop-down menu. *Claim* is recommended in most cases.
5857

modules/config-htpasswd-idp-terraform.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ifeval::["{context}" == "rosa-hcp-creating-a-cluster-quickly-terraform"]
99
endif::[]
1010

1111
[id="config-htpasswd-idp-terraform_{context}"]
12-
= Configuring an htpasswd identity provider with Terraform
12+
= Configure an htpasswd identity provider with Terraform
1313

1414
ifdef::tf-config[]
1515
[role="_abstract"]
@@ -112,7 +112,7 @@ $ cat<<-EOF>htpasswd_idp.tf
112112
EOF
113113
----
114114
+
115-
You must replace the `<cluster_id>` placeholder with the 32-digit ID for your cluster. To find that value, run `rosa list clusters | awk '{print $1}'`. You also must replace the `<user_name>` placeholder with the username you want to create as well as a password for the `<password>` placeholder.
115+
You must replace the `<cluster_id>` placeholder with the 32-digit ID for your cluster. To find that value, run `rosa list clusters | awk '{print $1}'`. You also must replace the `<user_name>` placeholder with the username you want to create and a password for the `<password>` placeholder.
116116

117117
. Run the following command to configure Terraform to create your resources based on your Terraform files:
118118
+

modules/config-ldap-idp.adoc

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="config-ldap-idp_{context}"]
8-
= Configuring a LDAP identity provider
8+
= Configure a LDAP identity provider
99

1010
[role="_abstract"]
1111
Configure the LDAP identity provider to validate user names and passwords against an LDAPv3 server, using simple bind authentication.
1212

1313
.Prerequisites
1414

15-
* When configuring a LDAP identity provider, you will need to enter a configured *LDAP URL*. The configured URL is an RFC 2255 URL, which specifies the LDAP host and
16-
search parameters to use. The syntax of the URL is:
15+
* When configuring a LDAP identity provider, you need to enter a configured *LDAP URL*. The configured URL is an RFC 2255 URL, which specifies the LDAP host and search parameters to use. The syntax of the URL is:
1716
+
1817
----
1918
ldap://host:port/basedn?attribute?scope?filter
@@ -26,22 +25,13 @@ ldap://host:port/basedn?attribute?scope?filter
2625
(LDAPS), use `ldaps` instead.
2726
.^|`host:port` | The name and port of the LDAP server. Defaults to
2827
`localhost:389` for ldap and `localhost:636` for LDAPS.
29-
.^|`basedn` | The DN of the branch of the directory where all searches should
30-
start from. At the very least, this must be the top of your directory tree, but
31-
it could also specify a subtree in the directory.
32-
.^|`attribute` | The attribute to search for. Although RFC 2255 allows a
33-
comma-separated list of attributes, only the first attribute will be used, no
34-
matter how many are provided. If no attributes are provided, the default is to
35-
use `uid`. It is recommended to choose an attribute that will be unique across
36-
all entries in the subtree you will be using.
37-
.^|`scope` | The scope of the search. Can be either `one` or `sub`.
38-
If the scope is not provided, the default is to use a scope of `sub`.
39-
.^|`filter` | A valid LDAP search filter. If not provided, defaults to
40-
`(objectClass=*)`
28+
.^|`basedn` | The DN of the branch of the directory where all searches should start from. At the very least, this must be the top of your directory tree, but it could also specify a subtree in the directory.
29+
.^|`attribute` | The attribute to search for. Although RFC 2255 allows a comma-separated list of attributes, only the first attribute is used, no matter how many are provided. If no attributes are provided, the default is to use `uid`. Choose an attribute that is unique across all entries in the subtree you are using.
30+
.^|`scope` | The scope of the search. Can be either `one` or `sub`. If the scope is not provided, the default is to use a scope of `sub`.
31+
.^|`filter` | A valid LDAP search filter. If not provided, defaults to `(objectClass=*)`
4132
|===
4233
+
43-
When doing searches, the attribute, filter, and provided user name are combined
44-
to create a search filter that looks like:
34+
When doing searches, the attribute, filter, and provided user name are combined to create a search filter that looks like:
4535
+
4636
----
4737
(&(<filter>)(<attribute>=<username>))
@@ -62,7 +52,7 @@ If the LDAP directory requires authentication to search, specify a `bindDN` and
6252
+
6353
[NOTE]
6454
====
65-
You can also click the *Add Oauth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
55+
You can also click the *Add OAuth configuration* link in the warning message displayed after cluster creation to configure your identity providers.
6656
====
6757

6858
. Select *LDAP* from the drop-down menu.
@@ -80,7 +70,7 @@ You can also click the *Add Oauth configuration* link in the warning message dis
8070
** Optional: Enter a *Preferred username* attribute whose value should be used as the display name. Click *Add more* to add multiple preferred username attributes.
8171
** Optional: Enter an *Email* attribute whose value should be used as the email address. Click *Add more* to add multiple email attributes.
8272

83-
. Optional: Click *Show advanced Options* to add a certificate authority (CA) file to your LDAP identity provider to validate server certificates for the configured URL. Click *Browse* to locate and attach a *CA file* to the identity provider.
73+
. Optional: Click *Show advanced options* to add a certificate authority (CA) file to your LDAP identity provider to validate server certificates for the configured URL. Click *Browse* to locate and attach a *CA file* to the identity provider.
8474

8575
. Optional: Under the advanced options, you can choose to make the LDAP provider *Insecure*. If you select this option, a CA file cannot be used.
8676
+

0 commit comments

Comments
 (0)