Skip to content

Commit 85ec15a

Browse files
authored
Merge pull request #66488 from jeana-redhat/OSDOCS-6135-installing-azure-short-term-creds-revisions
[OSDOCS-6135]: Additional feedback
2 parents 4ebf111 + 43a6644 commit 85ec15a

File tree

5 files changed

+32
-6
lines changed

5 files changed

+32
-6
lines changed

authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ In manual mode with Azure AD Workload Identity, the individual {product-title} c
8686
.Additional resources
8787
* xref:../../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-with-short-term-creds_installing-azure-customizations[Configuring a global Microsoft Azure cluster to use short-term credentials]
8888

89-
//Azure AD Workload Identity authentication process (placeholder)
90-
//include::modules/cco-short-term-creds-auth-flow-azure.adoc[leveloffset=+2]
89+
//Azure AD Workload Identity authentication process
90+
include::modules/cco-short-term-creds-auth-flow-azure.adoc[leveloffset=+2]
9191

9292
//Azure component secret formats
9393
include::modules/cco-short-term-creds-format-azure.adoc[leveloffset=+2]
116 KB
Loading

installing/installing_azure/installing-azure-user-infra.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ The steps for performing a user-provisioned infrastructure installation are prov
2222
* You read the documentation on xref:../../installing/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
2323
* You xref:../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[configured an Azure account] to host the cluster.
2424
* You downloaded the Azure CLI and installed it on your computer. See link:https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest[Install the Azure CLI] in the Azure documentation. The documentation below was last tested using version `2.38.0` of the Azure CLI. Azure CLI commands might perform differently based on the version you use.
25+
* If the cloud identity and access management (IAM) APIs are not accessible in your environment, or if you do not want to store an administrator-level credential secret in the `kube-system` namespace, see xref:../../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-manual-modes_installing-azure-customizations[Alternatives to storing administrator-level secrets in the kube-system project].
2526
* If you use a firewall and plan to use the Telemetry service, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured the firewall to allow the sites] that your cluster requires access to.
26-
* If the cloud identity and access management (IAM) APIs are not accessible in your environment, or if you do not want to store an administrator-level credential secret in the `kube-system` namespace, you can xref:../../installing/installing_azure/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[manually create and maintain long-term credentials].
2727
+
2828
[NOTE]
2929
====

modules/cco-ccoctl-creating-at-once.adoc

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ ifdef::alibabacloud-default,alibabacloud-customizations,alibabacloud-vpc[]
153153
* Created a RAM user with sufficient permission to create the {product-title} cluster.
154154
* Added the AccessKeyID (`access_key_id`) and AccessKeySecret (`access_key_secret`) of that RAM user into the link:https://www.alibabacloud.com/help/en/doc-detail/311667.htm#h2-sls-mfm-3p3[`~/.alibabacloud/credentials` file] on your local computer.
155155
endif::alibabacloud-default,alibabacloud-customizations,alibabacloud-vpc[]
156+
ifdef::azure-workload-id[]
157+
* Access to your Microsoft Azure account by using the Azure CLI.
158+
endif::azure-workload-id[]
156159
157160
.Procedure
158161

@@ -183,6 +186,15 @@ $ oc adm release extract \
183186
This command might take a few moments to run.
184187
====
185188

189+
ifdef::azure-workload-id[]
190+
. To enable the `ccoctl` utility to detect your Azure credentials automatically, log in to the Azure CLI by running the following command:
191+
+
192+
[source,terminal]
193+
----
194+
$ az login
195+
----
196+
endif::azure-workload-id[]
197+
186198
ifdef::aws-sts,google-cloud-platform,azure-workload-id[]
187199
. Use the `ccoctl` tool to process all `CredentialsRequest` objects by running the following command:
188200
+
@@ -250,6 +262,8 @@ $ ccoctl azure create-all \
250262
[NOTE]
251263
====
252264
If your cluster uses Technology Preview features that are enabled by the `TechPreviewNoUpgrade` feature set, you must include the `--enable-tech-preview` parameter.
265+
266+
To see additional optional parameters and explanations of how to use them, run the `azure create-all --help` command.
253267
====
254268
endif::azure-workload-id[]
255269

@@ -351,8 +365,21 @@ openshift-machine-api-aws-cloud-credentials-credentials.yaml
351365
You can verify that the IAM roles are created by querying AWS. For more information, refer to AWS documentation on listing IAM roles.
352366
endif::aws-sts[]
353367
ifdef::google-cloud-platform[]
368+
+
369+
.Example output
370+
[source,text]
371+
----
372+
cluster-authentication-02-config.yaml
373+
openshift-cloud-controller-manager-gcp-ccm-cloud-credentials-credentials.yaml
374+
openshift-cloud-credential-operator-cloud-credential-operator-gcp-ro-creds-credentials.yaml
375+
openshift-cloud-network-config-controller-cloud-credentials-credentials.yaml
376+
openshift-cluster-csi-drivers-gcp-pd-cloud-credentials-credentials.yaml
377+
openshift-image-registry-installer-cloud-credentials-credentials.yaml
378+
openshift-ingress-operator-cloud-credentials-credentials.yaml
379+
openshift-machine-api-gcp-cloud-credentials-credentials.yaml
380+
----
381+
+
354382
You can verify that the IAM service accounts are created by querying GCP. For more information, refer to GCP documentation on listing IAM service accounts.
355-
//to-do: include sample output for GCP when available.
356383
endif::google-cloud-platform[]
357384
ifdef::azure-workload-id[]
358385
+

modules/cco-short-term-creds-auth-flow-azure.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@
88

99
The following diagram details the authentication flow between Azure and the {product-title} cluster when using Azure AD Workload Identity.
1010

11-
//todo: work with dev and diagrams team to get a diagram for Azure
1211
.Azure AD Workload Identity authentication flow
13-
//image::azure_ad_workload_identity_flow.png[Detailed authentication flow between Azure and the cluster when using Azure AD Workload Identity]
12+
image::347_OpenShift_credentials_with_STS_updates_1023_Azure.png[Detailed authentication flow between Azure and the cluster when using Azure AD Workload Identity]

0 commit comments

Comments
 (0)