Skip to content

Commit 068bf72

Browse files
Merge pull request #76797 from snarayan-redhat/OSDOCS-10758_contentimpAzure
OSDOCS#10758: Azure reorg
2 parents 6300014 + 93b1279 commit 068bf72

File tree

41 files changed

+367
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+367
-323
lines changed

_topic_maps/_topic_map.yml

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -200,33 +200,41 @@ Topics:
200200
Dir: installing_azure
201201
Distros: openshift-origin,openshift-enterprise
202202
Topics:
203-
- Name: Preparing to install on Azure
203+
- Name: Preparing to install
204204
File: preparing-to-install-on-azure
205205
- Name: Configuring an Azure account
206206
File: installing-azure-account
207-
- Name: Enabling user-managed encryption on Azure
207+
- Name: Enabling user-managed encryption
208208
File: enabling-user-managed-encryption-azure
209-
- Name: Installing a cluster quickly on Azure
210-
File: installing-azure-default
211-
- Name: Installing a cluster on Azure with customizations
212-
File: installing-azure-customizations
213-
- Name: Installing a cluster on Azure with network customizations
214-
File: installing-azure-network-customizations
215-
- Name: Installing a cluster on Azure into an existing VNet
216-
File: installing-azure-vnet
217-
- Name: Installing a private cluster on Azure
218-
File: installing-azure-private
219-
- Name: Installing a cluster on Azure into a government region
220-
File: installing-azure-government-region
221-
- Name: Installing a cluster on Azure in a restricted network with user-provisioned infrastructure
222-
File: installing-restricted-networks-azure-user-provisioned
223-
- Name: Installing a cluster on Azure using ARM templates
224-
File: installing-azure-user-infra
225-
- Name: Installing a cluster on Azure in a restricted network
226-
File: installing-restricted-networks-azure-installer-provisioned
227-
- Name: Installing a three-node cluster on Azure
209+
- Name: Installer-provisioned infrastructure
210+
Dir: ipi
211+
Distros: openshift-origin,openshift-enterprise
212+
Topics:
213+
- Name: Installing a cluster
214+
File: installing-azure-default
215+
- Name: Installing a cluster with customizations
216+
File: installing-azure-customizations
217+
- Name: Installing a cluster with network customizations
218+
File: installing-azure-network-customizations
219+
- Name: Installing a cluster in a restricted network
220+
File: installing-restricted-networks-azure-installer-provisioned
221+
- Name: Installing a cluster into an existing VNet
222+
File: installing-azure-vnet
223+
- Name: Installing a private cluster
224+
File: installing-azure-private
225+
- Name: Installing a cluster into a government region
226+
File: installing-azure-government-region
227+
- Name: User-provisioned infrastructure
228+
Dir: upi
229+
Distros: openshift-origin,openshift-enterprise
230+
Topics:
231+
- Name: Installing a cluster in a restricted network with user-provisioned infrastructure
232+
File: installing-restricted-networks-azure-user-provisioned
233+
- Name: Installing a cluster using ARM templates
234+
File: installing-azure-user-infra
235+
- Name: Installing a three-node cluster
228236
File: installing-azure-three-node
229-
- Name: Uninstalling a cluster on Azure
237+
- Name: Uninstalling a cluster
230238
File: uninstalling-cluster-azure
231239
- Name: Installation configuration parameters for Azure
232240
File: installation-config-parameters-azure

_unused_topics/manually-creating-iam-azure.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ include::modules/manually-create-identity-access-management.adoc[leveloffset=+1]
2424
== Next steps
2525

2626
* Install an {product-title} cluster:
27-
** xref:../../installing/installing_azure/installing-azure-default.adoc#installing-azure-default[Installing a cluster quickly on Azure] with default options on installer-provisioned infrastructure
28-
** xref:../../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[Install a cluster with cloud customizations on installer-provisioned infrastructure]
29-
** xref:../../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Install a cluster with network customizations on installer-provisioned infrastructure]
27+
** xref:../../installing/installing_azure/ipi/installing-azure-default.adoc#installing-azure-default[Installing a cluster quickly on Azure] with default options on installer-provisioned infrastructure
28+
** xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Install a cluster with cloud customizations on installer-provisioned infrastructure]
29+
** xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Install a cluster with network customizations on installer-provisioned infrastructure]

authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ An AWS, global Azure, or GCP cluster that uses manual mode might be configured t
2727
== Additional resources
2828

2929
* xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[Manually creating long-term credentials for AWS]
30-
* xref:../../installing/installing_azure/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure]
30+
* xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure]
3131
* xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[Manually creating long-term credentials for GCP]
3232
* xref:../../installing/installing_ibm_cloud_public/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]
3333
* xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#manually-create-iam-nutanix_installing-nutanix-installer-provisioned[Configuring IAM for Nutanix]

authentication/managing_cloud_provider_credentials/cco-mode-passthrough.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To locate the `CredentialsRequest` CRs that are required, see xref:../../install
2929
=== Microsoft Azure permissions
3030
The credential you provide for passthrough mode in Azure must have all the requested permissions for all `CredentialsRequest` CRs that are required by the version of {product-title} you are running or installing.
3131

32-
To locate the `CredentialsRequest` CRs that are required, see xref:../../installing/installing_azure/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure].
32+
To locate the `CredentialsRequest` CRs that are required, see xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure].
3333

3434
[id="passthrough-mode-permissions-gcp"]
3535
=== Google Cloud Platform (GCP) permissions
@@ -81,7 +81,7 @@ include::modules/admin-credentials-root-secret-formats.adoc[leveloffset=+1]
8181

8282
[id="passthrough-mode-maintenance"]
8383
== Passthrough mode credential maintenance
84-
If `CredentialsRequest` CRs change over time as the cluster is upgraded, you must manually update the passthrough mode credential to meet the requirements. To avoid credentials issues during an upgrade, check the `CredentialsRequest` CRs in the release image for the new version of {product-title} before upgrading. To locate the `CredentialsRequest` CRs that are required for your cloud provider, see _Manually creating long-term credentials_ for xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[AWS], xref:../../installing/installing_azure/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Azure], or xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[GCP].
84+
If `CredentialsRequest` CRs change over time as the cluster is upgraded, you must manually update the passthrough mode credential to meet the requirements. To avoid credentials issues during an upgrade, check the `CredentialsRequest` CRs in the release image for the new version of {product-title} before upgrading. To locate the `CredentialsRequest` CRs that are required for your cloud provider, see _Manually creating long-term credentials_ for xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Azure], or xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[GCP].
8585

8686
//Rotating cloud provider credentials manually
8787
include::modules/manually-rotating-cloud-creds.adoc[leveloffset=+2]
@@ -96,11 +96,11 @@ When using passthrough mode, each component has the same permissions used by all
9696

9797
After installation, you can reduce the permissions on your credential to only those that are required to run the cluster, as defined by the `CredentialsRequest` CRs in the release image for the version of {product-title} that you are using.
9898

99-
To locate the `CredentialsRequest` CRs that are required for AWS, Azure, or GCP and learn how to change the permissions the CCO uses, see _Manually creating long-term credentials_ for xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[AWS], xref:../../installing/installing_azure/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Azure], or xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[GCP].
99+
To locate the `CredentialsRequest` CRs that are required for AWS, Azure, or GCP and learn how to change the permissions the CCO uses, see _Manually creating long-term credentials_ for xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Azure], or xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[GCP].
100100

101101
[role="_additional-resources"]
102102
== Additional resources
103103

104104
* xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[Manually creating long-term credentials for AWS]
105-
* xref:../../installing/installing_azure/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure]
105+
* xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure]
106106
* xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[Manually creating long-term credentials for GCP]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ In manual mode with {entra-first}, the individual {product-title} cluster compon
8282

8383
[role="_additional-resources"]
8484
.Additional resources
85-
* 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]
85+
* xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-with-short-term-creds_installing-azure-customizations[Configuring a global Microsoft Azure cluster to use short-term credentials]
8686

8787
//Microsoft Entra Workload ID authentication process
8888
include::modules/cco-short-term-creds-auth-flow-azure.adoc[leveloffset=+2]
@@ -106,5 +106,5 @@ include::modules/cco-short-term-creds-azure-olm.adoc[leveloffset=+2]
106106

107107
* xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-with-short-term-creds_installing-aws-customizations[Configuring an AWS cluster to use short-term credentials]
108108
* xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-with-short-term-creds_installing-gcp-customizations[Configuring a GCP cluster to use short-term credentials]
109-
* 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]
109+
* xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-with-short-term-creds_installing-azure-customizations[Configuring a global Microsoft Azure cluster to use short-term credentials]
110110
* xref:../../updating/preparing_for_updates/preparing-manual-creds-update.adoc#preparing-manual-creds-update[Preparing to update a cluster with manually maintained credentials]

installing/installing-fips.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ To enable FIPS mode for your cluster, you must run the installation program from
9494
====
9595

9696
* xref:../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[Amazon Web Services]
97-
* xref:../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[Microsoft Azure]
97+
* xref:../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Microsoft Azure]
9898
* xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Bare metal]
9999
* xref:../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[Google Cloud Platform]
100100
* xref:../installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[{ibm-cloud-name}]

0 commit comments

Comments
 (0)