diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index a8d641d084..2ec14e479a 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -253,19 +253,31 @@ Topics: Dir: installing_azure_stack_hub Distros: openshift-origin,openshift-enterprise Topics: - - Name: Preparing to install on Azure Stack Hub + - Name: Installation methods File: preparing-to-install-on-azure-stack-hub - Name: Configuring an Azure Stack Hub account File: installing-azure-stack-hub-account - - Name: Installing a cluster on Azure Stack Hub with an installer-provisioned infrastructure - File: installing-azure-stack-hub-default - - Name: Installing a cluster on Azure Stack Hub with network customizations - File: installing-azure-stack-hub-network-customizations - - Name: Installing a cluster on Azure Stack Hub using ARM templates - File: installing-azure-stack-hub-user-infra - - Name: Installation configuration parameters for Azure Stack Hub + - Name: Installer-provisioned infrastructure + Dir: ipi + Distros: openshift-origin,openshift-enterprise + Topics: + - Name: Preparing to install a cluster + File: ipi-ash-preparing-to-install + - Name: Installing a cluster + File: installing-azure-stack-hub-default + - Name: Installing a cluster with network customizations + File: installing-azure-stack-hub-network-customizations + - Name: User-provisioned infrastructure + Dir: upi + Distros: openshift-origin,openshift-enterprise + Topics: + - Name: Preparing to install a cluster + File: upi-ash-preparing-to-install + - Name: Installing a cluster using ARM templates + File: installing-azure-stack-hub-user-infra + - Name: Installation configuration parameters File: installation-config-parameters-ash - - Name: Uninstalling a cluster on Azure Stack Hub + - Name: Uninstalling a cluster File: uninstalling-cluster-azure-stack-hub - Name: Installing on GCP Dir: installing_gcp diff --git a/installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc b/installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc index 3b6333023e..f346b0f75d 100644 --- a/installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc +++ b/installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc @@ -18,7 +18,7 @@ include::modules/installation-azure-limits.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage]. +* xref:../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage] include::modules/installation-azure-stack-hub-network-config.adoc[leveloffset=+1] @@ -29,11 +29,11 @@ include::modules/installation-azure-service-principal.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* For more information about CCO modes, see xref:../../authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc#about-cloud-credential-operator-modes[About the Cloud Credential Operator]. +* xref:../../authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc#about-cloud-credential-operator-modes[About the Cloud Credential Operator] [id="next-steps_installing-azure-stack-hub-account"] == Next steps * Install an {product-title} cluster: -** xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Installing a cluster quickly on Azure Stack Hub]. -** Install an {product-title} cluster on Azure Stack Hub with user-provisioned infrastructure by following xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Installing a cluster on Azure Stack Hub using ARM templates]. +** xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Installing a cluster on Azure Stack Hub with customizations] +** Install an {product-title} cluster on Azure Stack Hub with user-provisioned infrastructure by following xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Installing a cluster on Azure Stack Hub using ARM templates]. diff --git a/installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc b/installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc deleted file mode 100644 index 150a198218..0000000000 --- a/installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc +++ /dev/null @@ -1,76 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="installing-azure-stack-hub-default"] -= Installing a cluster on Azure Stack Hub with an installer-provisioned infrastructure -include::_attributes/common-attributes.adoc[] -:context: installing-azure-stack-hub-default - -toc::[] - -In {product-title} version {product-version}, you can install a cluster on Microsoft Azure Stack Hub with an installer-provisioned infrastructure. However, you must manually configure the `install-config.yaml` file to specify values that are specific to Azure Stack Hub. - -[NOTE] -==== -While you can select `azure` when using the installation program to deploy a cluster using installer-provisioned infrastructure, this option is only supported for the Azure Public Cloud. -==== - -[id="prerequisites_installing-azure-stack-hub-default"] -== Prerequisites - -* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[configured an Azure Stack Hub account] to host the cluster. -* If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You verified that you have approximately 16 GB of local disk space. Installing the cluster requires that you download the {op-system} virtual hard disk (VHD) cluster image and upload it to your Azure Stack Hub environment so that it is accessible during deployment. Decompressing the VHD files requires this amount of local disk space. - -include::modules/cluster-entitlements.adoc[leveloffset=+1] - -include::modules/ssh-agent-using.adoc[leveloffset=+1] - -include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=+1] - -include::modules/installation-obtaining-installer.adoc[leveloffset=+1] - -include::modules/installation-initializing-manual.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources -* xref:../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub] - -include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2] - -include::modules/manually-create-identity-access-management.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_installing-azure-stack-hub-default-cco"] -.Additional resources -* xref:../../updating/preparing_for_updates/preparing-manual-creds-update.adoc#manually-maintained-credentials-upgrade_preparing-manual-creds-update[Updating cloud provider resources with manually maintained credentials] - -include::modules/azure-stack-hub-internal-ca.adoc[leveloffset=+1] - -include::modules/installation-launching-installer.adoc[leveloffset=+1] - -include::modules/cli-installing-cli.adoc[leveloffset=+1] - -include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] - -include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_installing-azure-stack-hub-default-console"] -.Additional resources -* xref:../../web_console/web-console.adoc#web-console[Accessing the web console] - -include::modules/cluster-telemetry.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_installing-azure-stack-hub-default-telemetry"] -.Additional resources -* xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] - -[id="next-steps_installing-azure-stack-hub-default"] -== Next steps - -* xref:../../installing/validation_and_troubleshooting/validating-an-installation.adoc#validating-an-installation[Validating an installation]. -* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster]. -* If necessary, you can xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting]. -* If necessary, you can xref:../../post_installation_configuration/changing-cloud-credentials-configuration.adoc#manually-removing-cloud-creds_changing-cloud-credentials-configuration[remove cloud provider credentials]. diff --git a/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc b/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc deleted file mode 100644 index 2c7fc3fea2..0000000000 --- a/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc +++ /dev/null @@ -1,90 +0,0 @@ -[id="installing-azure-stack-hub-network-customizations"] -= Installing a cluster on Azure Stack Hub with network customizations -include::_attributes/common-attributes.adoc[] -:context: installing-azure-stack-hub-network-customizations - -toc::[] - -In {product-title} version {product-version}, you can install a cluster with a customized network configuration on infrastructure that the installation program provisions on Azure Stack Hub. By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. - -[NOTE] -==== -While you can select `azure` when using the installation program to deploy a cluster using installer-provisioned infrastructure, this option is only supported for the Azure Public Cloud. -==== - -[id="prerequisites_installing-azure-stack-hub-network-customizations"] -== Prerequisites - -* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[configured an Azure Stack Hub account] to host the cluster. -* If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. -* You verified that you have approximately 16 GB of local disk space. Installing the cluster requires that you download the {op-system} virtual hard disk (VHD) cluster image and upload it to your Azure Stack Hub environment so that it is accessible during deployment. Decompressing the VHD files requires this amount of local disk space. - -include::modules/cluster-entitlements.adoc[leveloffset=+1] - -include::modules/ssh-agent-using.adoc[leveloffset=+1] - -include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=+1] - -include::modules/installation-obtaining-installer.adoc[leveloffset=+1] - -include::modules/installation-initializing-manual.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources -* xref:../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub] - -include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2] - -include::modules/manually-create-identity-access-management.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_installing-azure-stack-hub-network-customizations-cco"] -.Additional resources -* xref:../../updating/updating_a_cluster/updating-cluster-web-console.adoc#manually-maintained-credentials-upgrade_updating-cluster-web-console[Updating a cluster using the web console] -* xref:../../updating/updating_a_cluster/updating-cluster-cli.adoc#manually-maintained-credentials-upgrade_updating-cluster-cli[Updating a cluster using the CLI] - -include::modules/azure-stack-hub-internal-ca.adoc[leveloffset=+1] - -//include::modules/installation-launching-installer.adoc[leveloffset=+1] -//Leaving this stubbed in case future might remove the requirement to manually configure the install configuration file. - -// Network Operator specific configuration -include::modules/nw-network-config.adoc[leveloffset=+1] -include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1] -include::modules/nw-operator-cr.adoc[leveloffset=+1] -include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1] - -[NOTE] -==== -For more information on using Linux and Windows nodes in the same cluster, see xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]. -==== - -include::modules/installation-launching-installer.adoc[leveloffset=+1] - -include::modules/cli-installing-cli.adoc[leveloffset=+1] - -include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] - -include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_installing-azure-stack-hub-network-customizations-console"] -.Additional resources -* xref:../../web_console/web-console.adoc#web-console[Accessing the web console]. - -include::modules/cluster-telemetry.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_installing-azure-stack-hub-network-customizations-telemetry"] -.Additional resources -* xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] - -[id="next-steps_installing-azure-stack-hub-network-customizations"] -== Next steps - -* xref:../../installing/validation_and_troubleshooting/validating-an-installation.adoc#validating-an-installation[Validating an installation]. -* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster]. -* If necessary, you can xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting]. -* If necessary, you can xref:../../post_installation_configuration/changing-cloud-credentials-configuration.adoc#manually-removing-cloud-creds_changing-cloud-credentials-configuration[remove cloud provider credentials]. diff --git a/installing/installing_azure_stack_hub/ipi/_attributes b/installing/installing_azure_stack_hub/ipi/_attributes new file mode 120000 index 0000000000..cd86bd826c --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/_attributes @@ -0,0 +1 @@ +../../../_attributes \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/ipi/images b/installing/installing_azure_stack_hub/ipi/images new file mode 120000 index 0000000000..4dd3347de1 --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/images @@ -0,0 +1 @@ +../../../images \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc b/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc new file mode 100644 index 0000000000..54120ebc72 --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc @@ -0,0 +1,61 @@ +:_mod-docs-content-type: ASSEMBLY +[id="installing-azure-stack-hub-default"] += Installing a cluster on Azure Stack Hub with customizations +include::_attributes/common-attributes.adoc[] +:context: installing-azure-stack-hub-default + +toc::[] + +In {product-title} version {product-version}, you can install a cluster on Microsoft Azure Stack Hub with an installer-provisioned infrastructure. However, you must manually configure the `install-config.yaml` file to specify values that are specific to Azure Stack Hub. + +[NOTE] +==== +While you can select `azure` when using the installation program to deploy a cluster using installer-provisioned infrastructure, this option is only supported for the Azure Public Cloud. +==== + +[id="prerequisites_installing-azure-stack-hub-default-ipi"] +== Prerequisites + +* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. +* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. +* You xref:../../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[configured an Azure Stack Hub account] to host the cluster. +* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. +* You verified that you have approximately 16 GB of local disk space. Installing the cluster requires that you download the {op-system} virtual hard drive (VHD) cluster image and upload it to your Azure Stack Hub environment so that it is accessible during deployment. Decompressing the VHD files requires this amount of local disk space. + +include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=+1] + +include::modules/installation-initializing-manual.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources +* xref:../../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub] + +include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2] + +include::modules/manually-create-identity-access-management.adoc[leveloffset=+1] + +[role="_additional-resources"] +[id="additional-resources_installing-azure-stack-hub-default-cco"] +.Additional resources +* xref:../../../updating/preparing_for_updates/preparing-manual-creds-update.adoc#manually-maintained-credentials-upgrade_preparing-manual-creds-update[Updating cloud provider resources with manually maintained credentials] + +include::modules/azure-stack-hub-internal-ca.adoc[leveloffset=+1] + +include::modules/installation-launching-installer.adoc[leveloffset=+1] + +include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] + +include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1] + +[role="_additional-resources"] +[id="additional-resources_installing-azure-stack-hub-default-console"] +.Additional resources +* xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] + +[id="next-steps_installing-azure-stack-hub-default-ipi"] +== Next steps + +* xref:../../../installing/validation_and_troubleshooting/validating-an-installation.adoc#validating-an-installation[Validating an installation] +* xref:../../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster] +* Optional: xref:../../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[Opt out of remote health reporting] +* Optional: xref:../../../post_installation_configuration/changing-cloud-credentials-configuration.adoc#manually-removing-cloud-creds_changing-cloud-credentials-configuration[Remove cloud provider credentials] diff --git a/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc b/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc new file mode 100644 index 0000000000..ed702979f5 --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc @@ -0,0 +1,80 @@ +[id="installing-azure-stack-hub-network-customizations"] += Installing a cluster on Azure Stack Hub with network customizations +include::_attributes/common-attributes.adoc[] +:context: installing-azure-stack-hub-network-customizations + +toc::[] + +In {product-title} version {product-version}, you can install a cluster with a customized network configuration on infrastructure that the installation program provisions on Azure Stack Hub. By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. + +[NOTE] +==== +While you can select `azure` when using the installation program to deploy a cluster using installer-provisioned infrastructure, this option is only supported for the Azure Public Cloud. +==== + +[id="prerequisites_installing-azure-stack-hub-network-customizations"] +== Prerequisites + +* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. +* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. +* You xref:../../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[configured an Azure Stack Hub account] to host the cluster. +* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to. +* You verified that you have approximately 16 GB of local disk space. Installing the cluster requires that you download the {op-system} virtual hard drive (VHD) cluster image and upload it to your Azure Stack Hub environment so that it is accessible during deployment. Decompressing the VHD files requires this amount of local disk space. + +include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=+1] + +include::modules/installation-initializing-manual.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources +* xref:../../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub] + +include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2] + +include::modules/manually-create-identity-access-management.adoc[leveloffset=+1] + +[role="_additional-resources"] +[id="additional-resources_installing-azure-stack-hub-network-customizations-cco"] +.Additional resources +* xref:../../../updating/updating_a_cluster/updating-cluster-web-console.adoc#manually-maintained-credentials-upgrade_updating-cluster-web-console[Updating a cluster using the web console] +* xref:../../../updating/updating_a_cluster/updating-cluster-cli.adoc#manually-maintained-credentials-upgrade_updating-cluster-cli[Updating a cluster using the CLI] + +include::modules/azure-stack-hub-internal-ca.adoc[leveloffset=+1] + +//include::modules/installation-launching-installer.adoc[leveloffset=+1] +//Leaving this stubbed in case future might remove the requirement to manually configure the install configuration file. + +// Network Operator specific configuration +include::modules/nw-network-config.adoc[leveloffset=+1] +include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1] +include::modules/nw-operator-cr.adoc[leveloffset=+1] +include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1] + + +[NOTE] +==== +For more information on using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]. +==== + + +include::modules/installation-launching-installer.adoc[leveloffset=+1] + +include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] + +include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1] + +[role="_additional-resources"] +[id="additional-resources_installing-azure-stack-hub-network-customizations-console"] +.Additional resources +* xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] + +[role="_additional-resources"] +[id="additional-resources_installing-azure-stack-hub-network-customizations-telemetry"] + +[id="next-steps_installing-azure-stack-hub-network-customizations"] +== Next steps + +* xref:../../../installing/validation_and_troubleshooting/validating-an-installation.adoc#validating-an-installation[Validating an installation] +* xref:../../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster] +* Optional: xref:../../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[Opt out of remote health reporting] +* Optional: xref:../../../post_installation_configuration/changing-cloud-credentials-configuration.adoc#manually-removing-cloud-creds_changing-cloud-credentials-configuration[Remove cloud provider credentials] diff --git a/installing/installing_azure_stack_hub/ipi/ipi-ash-preparing-to-install.adoc b/installing/installing_azure_stack_hub/ipi/ipi-ash-preparing-to-install.adoc new file mode 100644 index 0000000000..bb06550c53 --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/ipi-ash-preparing-to-install.adoc @@ -0,0 +1,36 @@ +:_mod-docs-content-type: ASSEMBLY +[id="ash-preparing-to-install-ipi"] += Preparing to install a cluster on Azure Stack Hub +include::_attributes/common-attributes.adoc[] +:context: ash-preparing-to-install-ipi + +toc::[] + +You prepare to install an {product-title} cluster on Azure Stack Hub by completing the following steps: + +* Verifying internet connectivity for your cluster. + +* xref:../../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[Configuring an Azure Stack Hub account]. + +* Generating an SSH key pair. You can use this key pair to authenticate into the {product-title} cluster's nodes after it is deployed. + +* Downloading the installation program. + +* Installing the {oc-first}. + +* The Cloud Credential Operator (CCO) only supports your cloud provider in manual mode. As a result, you must xref:../../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#manually-create-iam_installing-azure-stack-hub-default[manually manage clould credentials] by specifying the identity and access management (IAM) secrets for your cloud provider. + +include::modules/cluster-entitlements.adoc[leveloffset=+1] + +include::modules/ssh-agent-using.adoc[leveloffset=+1] + +include::modules/installation-obtaining-installer.adoc[leveloffset=+1] + +include::modules/cli-installing-cli.adoc[leveloffset=+1] + +include::modules/cluster-telemetry.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources + +* xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/ipi/modules b/installing/installing_azure_stack_hub/ipi/modules new file mode 120000 index 0000000000..5be29a99c1 --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/modules @@ -0,0 +1 @@ +../../../modules \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/ipi/snippets b/installing/installing_azure_stack_hub/ipi/snippets new file mode 120000 index 0000000000..2490678d80 --- /dev/null +++ b/installing/installing_azure_stack_hub/ipi/snippets @@ -0,0 +1 @@ +../../../snippets \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/manually-creating-iam-azure-stack-hub.adoc b/installing/installing_azure_stack_hub/manually-creating-iam-azure-stack-hub.adoc index 71e0e9d4ca..2ad9fe4170 100644 --- a/installing/installing_azure_stack_hub/manually-creating-iam-azure-stack-hub.adoc +++ b/installing/installing_azure_stack_hub/manually-creating-iam-azure-stack-hub.adoc @@ -29,5 +29,5 @@ include::modules/manually-maintained-credentials-upgrade.adoc[leveloffset=+1] == Next steps * Install an {product-title} cluster: -** xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Installing a cluster quickly on Azure Stack Hub]. -** xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Installing a cluster on Azure Stack Hub using ARM templates]. +** xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Installing a cluster quickly on Azure Stack Hub]. +** xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Installing a cluster on Azure Stack Hub using ARM templates]. diff --git a/installing/installing_azure_stack_hub/preparing-to-install-on-azure-stack-hub.adoc b/installing/installing_azure_stack_hub/preparing-to-install-on-azure-stack-hub.adoc index 08dc4e0cd4..a8a0c9f277 100644 --- a/installing/installing_azure_stack_hub/preparing-to-install-on-azure-stack-hub.adoc +++ b/installing/installing_azure_stack_hub/preparing-to-install-on-azure-stack-hub.adoc @@ -1,47 +1,30 @@ :_mod-docs-content-type: ASSEMBLY [id="preparing-to-install-on-azure-stack-hub"] -= Preparing to install on Azure Stack Hub += Installation methods include::_attributes/common-attributes.adoc[] :context: preparing-to-install-on-azure-stack-hub toc::[] -[id="preparing-to-install-on-ash-prerequisites"] -== Prerequisites - -* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You have installed Azure Stack Hub version 2008 or later. - -[id="requirements-for-installing-ocp-on-ash"] -== Requirements for installing {product-title} on Azure Stack Hub - -Before installing {product-title} on Microsoft Azure Stack Hub, you must configure an Azure account. - -See xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[Configuring an Azure Stack Hub account] for details about account configuration, account limits, DNS zone configuration, required roles, and creating service principals. - -[id="choosing-a-method-to-install-ocp-on-ash"] -== Choosing a method to install {product-title} on Azure Stack Hub - You can install {product-title} on installer-provisioned or user-provisioned infrastructure. The default installation type uses installer-provisioned infrastructure, where the installation program provisions the underlying infrastructure for the cluster. You can also install {product-title} on infrastructure that you provision. If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself. See xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process] for more information about installer-provisioned and user-provisioned installation processes. [id="choosing-a-method-to-install-ocp-on-ash-installer-provisioned"] -=== Installing a cluster on installer-provisioned infrastructure +== Installing a cluster on installer-provisioned infrastructure You can install a cluster on Azure Stack Hub infrastructure that is provisioned by the {product-title} installation program, by using the following method: -* **xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Installing a cluster on Azure Stack Hub with an installer-provisioned infrastructure]**: You can install {product-title} on Azure Stack Hub infrastructure that is provisioned by the {product-title} installation program. +* **xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Installing a cluster]**: You can install {product-title} on Azure Stack Hub infrastructure that is provisioned by the {product-title} installation program. [id="choosing-a-method-to-install-ocp-on-ash-user-provisioned"] -=== Installing a cluster on user-provisioned infrastructure +== Installing a cluster on user-provisioned infrastructure You can install a cluster on Azure Stack Hub infrastructure that you provision, by using the following method: -* **xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Installing a cluster on Azure Stack Hub using ARM templates]**: You can install {product-title} on Azure Stack Hub by using infrastructure that you provide. You can use the provided Azure Resource Manager (ARM) templates to assist with an installation. +* **xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Installing a cluster on Azure Stack Hub using ARM templates]**: You can install {product-title} on Azure Stack Hub by using infrastructure that you provide. You can use the provided Azure Resource Manager (ARM) templates to assist with an installation. [id="preparing-to-install-on-ash-next-steps"] -== Next steps +== Additional resources * xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[Configuring an Azure Stack Hub account] diff --git a/installing/installing_azure_stack_hub/upi/_attributes b/installing/installing_azure_stack_hub/upi/_attributes new file mode 120000 index 0000000000..cd86bd826c --- /dev/null +++ b/installing/installing_azure_stack_hub/upi/_attributes @@ -0,0 +1 @@ +../../../_attributes \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/upi/images b/installing/installing_azure_stack_hub/upi/images new file mode 120000 index 0000000000..4dd3347de1 --- /dev/null +++ b/installing/installing_azure_stack_hub/upi/images @@ -0,0 +1 @@ +../../../images \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc b/installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc similarity index 74% rename from installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc rename to installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc index 0c86a1c810..d5b9fd11a6 100644 --- a/installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc +++ b/installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc @@ -18,19 +18,17 @@ The steps for performing a user-provisioned infrastructure installation are prov [id="prerequisites_installing-azure-stack-hub-user-infra"] == Prerequisites -* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -* You read the documentation on xref:../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. -* You xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[configured an Azure Stack Hub account] to host the cluster. +* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. +* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. +* You xref:../../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[configured an Azure Stack Hub account] to host the cluster. * 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 tested using version `2.28.0` of the Azure CLI. Azure CLI commands might perform differently based on the version you use. -* 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. +* 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. + [NOTE] ==== Be sure to also review this site list if you are configuring a proxy. ==== -include::modules/cluster-entitlements.adoc[leveloffset=+1] - [id="installation-azure-stack-hub-user-infra-config-project"] == Configuring your Azure Stack Hub project @@ -46,7 +44,7 @@ include::modules/installation-azure-limits.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage]. +* xref:../../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage] include::modules/installation-azure-stack-hub-network-config.adoc[leveloffset=+2] @@ -60,18 +58,14 @@ include::modules/installation-azure-service-principal.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* For more information about CCO modes, see xref:../../authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc#about-cloud-credential-operator-modes[About the Cloud Credential Operator]. - -include::modules/installation-obtaining-installer.adoc[leveloffset=+1] - -include::modules/ssh-agent-using.adoc[leveloffset=+1] +* xref:../../../authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc#about-cloud-credential-operator-modes[About the Cloud Credential Operator] include::modules/installation-user-infra-generate.adoc[leveloffset=+1] include::modules/installation-initializing-manual.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub] +* xref:../../../installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc#installation-config-parameters-ash[Installation configuration parameters for Azure Stack Hub] include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2] @@ -83,7 +77,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#manually-create-iam_installing-azure-stack-hub-default[Manually manage cloud credentials] +* xref:../../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#manually-create-iam_installing-azure-stack-hub-default[Manually manage cloud credentials] include::modules/installation-disk-partitioning-upi-templates.adoc[leveloffset=+2] @@ -117,8 +111,6 @@ include::modules/installation-azure-user-infra-wait-for-bootstrap.adoc[leveloffs include::modules/installation-creating-azure-worker.adoc[leveloffset=+1] include::modules/installation-arm-worker.adoc[leveloffset=+2] -include::modules/cli-installing-cli.adoc[leveloffset=+1] - include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] include::modules/installation-approve-csrs.adoc[leveloffset=+1] @@ -130,4 +122,4 @@ include::modules/installation-azure-user-infra-completing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* See xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service. +* xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] diff --git a/installing/installing_azure_stack_hub/upi/modules b/installing/installing_azure_stack_hub/upi/modules new file mode 120000 index 0000000000..5be29a99c1 --- /dev/null +++ b/installing/installing_azure_stack_hub/upi/modules @@ -0,0 +1 @@ +../../../modules \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/upi/snippets b/installing/installing_azure_stack_hub/upi/snippets new file mode 120000 index 0000000000..2490678d80 --- /dev/null +++ b/installing/installing_azure_stack_hub/upi/snippets @@ -0,0 +1 @@ +../../../snippets \ No newline at end of file diff --git a/installing/installing_azure_stack_hub/upi/upi-ash-preparing-to-install.adoc b/installing/installing_azure_stack_hub/upi/upi-ash-preparing-to-install.adoc new file mode 100644 index 0000000000..bf1c7136ec --- /dev/null +++ b/installing/installing_azure_stack_hub/upi/upi-ash-preparing-to-install.adoc @@ -0,0 +1,27 @@ +:_mod-docs-content-type: ASSEMBLY +[id="upi-ash-preparing-to-install"] += Preparing to install a cluster on Azure Stack Hub +include::_attributes/common-attributes.adoc[] +:context: upi-ash-preparing-to-install + +toc::[] + +You prepare to install an {product-title} cluster on Azure Stack Hub by completing the following steps: + +* Verifying internet connectivity for your cluster. + +* xref:../../../installing/installing_azure_stack_hub/installing-azure-stack-hub-account.adoc#installing-azure-stack-hub-account[Configuring an Azure Stack Hub account]. + +* Generating an SSH key pair. You can use this key pair to authenticate into the {product-title} cluster's nodes after it is deployed. + +* Downloading the installation program. + +* Installing the {oc-first}. + +include::modules/cluster-entitlements.adoc[leveloffset=+1] + +include::modules/ssh-agent-using.adoc[leveloffset=+1] + +include::modules/installation-obtaining-installer.adoc[leveloffset=+1] + +include::modules/cli-installing-cli.adoc[leveloffset=+1] diff --git a/installing/overview/installing-preparing.adoc b/installing/overview/installing-preparing.adoc index a2fe6c15a7..dce2229363 100644 --- a/installing/overview/installing-preparing.adoc +++ b/installing/overview/installing-preparing.adoc @@ -53,7 +53,7 @@ Because you need to provision machines as part of the {product-title} cluster in Because the operating system is integral to {product-title}, it is easier to let the installation program for {product-title} stand up all of the infrastructure. These are called _installer provisioned infrastructure_ installations. In this type of installation, you can provide some existing infrastructure to the cluster, but the installation program deploys all of the machines that your cluster initially needs. -You can deploy an installer-provisioned infrastructure cluster without specifying any customizations to the cluster or its underlying machines to xref:../../installing/installing_aws/ipi/installing-aws-default.adoc#installing-aws-default[AWS], xref:../../installing/installing_azure/ipi/installing-azure-default.adoc#installing-azure-default[Azure], xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Azure Stack Hub], xref:../../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[GCP], xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[Nutanix]. +You can deploy an installer-provisioned infrastructure cluster without specifying any customizations to the cluster or its underlying machines to xref:../../installing/installing_aws/ipi/installing-aws-default.adoc#installing-aws-default[AWS], xref:../../installing/installing_azure/ipi/installing-azure-default.adoc#installing-azure-default[Azure], xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[Azure Stack Hub], xref:../../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[GCP], xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[Nutanix]. If you need to perform basic configuration for your installer-provisioned infrastructure cluster, such as the instance type for the cluster machines, you can customize an installation for xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Azure], xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[GCP], xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[Nutanix]. @@ -64,7 +64,7 @@ You can use the installer-provisioned infrastructure method to create appropriat For some installer-provisioned infrastructure installations, for example on the {vmw-first} and bare metal platforms, the external traffic that reaches the ingress virtual IP (VIP) is not balanced between the default `IngressController` replicas. For {vmw-short} and bare metal installer-provisioned infrastructure installations where exceeding the baseline `IngressController` router performance is expected, you must configure an external load balancer. Configuring an external load balancer achieves the performance of multiple `IngressController` replicas. For more information about the baseline `IngressController` performance, see xref:../../scalability_and_performance/optimization/routing-optimization.adoc#baseline-router-performance_routing-optimization[Baseline Ingress Controller (router) performance]. For more information about configuring an external load balancer, see xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#nw-osp-configuring-external-load-balancer_ipi-install-installation-workflow[Configuring a user-managed load balancer]. -If you want to reuse extensive cloud infrastructure, you can complete a _user-provisioned infrastructure_ installation. With these installations, you manually deploy the machines that your cluster requires during the installation process. If you perform a user-provisioned infrastructure installation on xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS], xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installing-azure-user-infra[Azure], xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Azure Stack Hub], you can use the provided templates to help you stand up all of the required components. You can also reuse a shared xref:../../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[VPC on GCP]. Otherwise, you can use the xref:../../installing/installing_platform_agnostic/installing-platform-agnostic.adoc#installing-platform-agnostic[provider-agnostic] installation method to deploy a cluster into other clouds. +If you want to reuse extensive cloud infrastructure, you can complete a _user-provisioned infrastructure_ installation. With these installations, you manually deploy the machines that your cluster requires during the installation process. If you perform a user-provisioned infrastructure installation on xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS], xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installing-azure-user-infra[Azure], xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Azure Stack Hub], you can use the provided templates to help you stand up all of the required components. You can also reuse a shared xref:../../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[VPC on GCP]. Otherwise, you can use the xref:../../installing/installing_platform_agnostic/installing-platform-agnostic.adoc#installing-platform-agnostic[provider-agnostic] installation method to deploy a cluster into other clouds. You can also complete a user-provisioned infrastructure installation on your existing hardware. If you use xref:../../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[{rh-openstack}], xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[{ibm-z-name} or {ibm-linuxone-name}], xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibm-z-name} and {ibm-linuxone-name} with {op-system-base} KVM], xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[{ibm-power-title}], or xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[vSphere], use the specific installation instructions to deploy your cluster. If you use other supported hardware, follow the xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[bare metal installation] procedure. For some of these platforms, such as xref:../../installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[vSphere], and xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[bare metal], you can also customize additional network parameters during installation. @@ -138,7 +138,7 @@ ifndef::openshift-origin[] |xref:../../installing/installing_aws/ipi/installing-aws-default.adoc#installing-aws-default[✓] |xref:../../installing/installing_azure/ipi/installing-azure-default.adoc#installing-azure-default[✓] |xref:../../installing/installing_azure/ipi/installing-azure-default.adoc#installing-azure-default[✓] -|xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[✓] +|xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[✓] |xref:../../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[✓] |xref:../../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[✓] |xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[✓] @@ -156,7 +156,7 @@ ifndef::openshift-origin[] |xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[✓] |xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[✓] |xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[✓] -|xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[✓] +|xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[✓] |xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[✓] |xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[✓] @@ -175,7 +175,7 @@ ifndef::openshift-origin[] |xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-network-customizations[✓] |xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓] |xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓] -|xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓] +|xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓] | @@ -333,7 +333,7 @@ ifdef::openshift-origin[] |Network customization |xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-network-customizations[✓] |xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓] -|xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓] +|xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓] | | @@ -435,7 +435,7 @@ ifndef::openshift-origin[] |xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[✓] |xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installing-azure-user-infra[✓] |xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installing-azure-user-infra[✓] -|xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[✓] +|xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[✓] |xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[✓] |xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[✓] | @@ -519,7 +519,7 @@ ifdef::openshift-origin[] |Custom |xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[✓] |xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installing-azure-user-infra[✓] -|xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[✓] +|xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[✓] |xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[✓] | |xref:../../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[✓] diff --git a/machine_management/user_infra/adding-compute-user-infra-general.adoc b/machine_management/user_infra/adding-compute-user-infra-general.adoc index ec3365126e..c5fcc931db 100644 --- a/machine_management/user_infra/adding-compute-user-infra-general.adoc +++ b/machine_management/user_infra/adding-compute-user-infra-general.adoc @@ -21,7 +21,7 @@ To add more compute machines to your {product-title} cluster on Microsoft Azure, [id="upi-adding-compute-ash"] == Adding compute machines to Azure Stack Hub -To add more compute machines to your {product-title} cluster on Azure Stack Hub, see xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installation-creating-azure-worker_installing-azure-stack-hub-user-infra[Creating additional worker machines in Azure Stack Hub]. +To add more compute machines to your {product-title} cluster on Azure Stack Hub, see xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installation-creating-azure-worker_installing-azure-stack-hub-user-infra[Creating additional worker machines in Azure Stack Hub]. [id="upi-adding-compute-gcp"] == Adding compute machines to Google Cloud Platform diff --git a/modules/cli-installing-cli.adoc b/modules/cli-installing-cli.adoc index d859fb260a..72eb760bdd 100644 --- a/modules/cli-installing-cli.adoc +++ b/modules/cli-installing-cli.adoc @@ -20,8 +20,6 @@ // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc -// * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc -// * installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_gcp/installing-gcp-private.adoc diff --git a/modules/cluster-entitlements.adoc b/modules/cluster-entitlements.adoc index 168beee1bc..e64a1189d6 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -25,7 +25,6 @@ // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc -// * installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc // * installing/installing_azure/installing-azure-default.adoc // * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc diff --git a/modules/installation-approve-csrs.adoc b/modules/installation-approve-csrs.adoc index 1a6a983ae6..f98f6963ec 100644 --- a/modules/installation-approve-csrs.adoc +++ b/modules/installation-approve-csrs.adoc @@ -217,7 +217,7 @@ It can take a few minutes after approval of the server CSRs for the machines to ==== .Additional information -* For more information on CSRs, see link:https://kubernetes.io/docs/reference/access-authn-authz/certificate-signing-requests/[Certificate Signing Requests]. +* link:https://kubernetes.io/docs/reference/access-authn-authz/certificate-signing-requests/[Certificate Signing Requests] ifeval::["{context}" == "installing-ibm-z"] :!ibm-z: diff --git a/modules/installation-obtaining-installer.adoc b/modules/installation-obtaining-installer.adoc index 8f8f9589a2..10989919f4 100644 --- a/modules/installation-obtaining-installer.adoc +++ b/modules/installation-obtaining-installer.adoc @@ -18,7 +18,6 @@ // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc -// * installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_gcp/installing-gcp-private.adoc diff --git a/modules/ssh-agent-using.adoc b/modules/ssh-agent-using.adoc index 85ed59ec03..c4d13b5e24 100644 --- a/modules/ssh-agent-using.adoc +++ b/modules/ssh-agent-using.adoc @@ -20,7 +20,6 @@ // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc -// * installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_gcp/installing-gcp-private.adoc diff --git a/updating/preparing_for_updates/preparing-manual-creds-update.adoc b/updating/preparing_for_updates/preparing-manual-creds-update.adoc index 58bd5b9d3d..9f55410e7f 100644 --- a/updating/preparing_for_updates/preparing-manual-creds-update.adoc +++ b/updating/preparing_for_updates/preparing-manual-creds-update.adoc @@ -63,7 +63,7 @@ include::modules/manually-maintained-credentials-upgrade.adoc[leveloffset=+1] .Additional resources * xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[Manually creating long-term credentials for AWS] * xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure] -* xref:../../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#manually-create-iam_installing-azure-stack-hub-default[Manually creating long-term credentials for Azure Stack Hub] +* xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc#manually-create-iam_installing-azure-stack-hub-default[Manually creating long-term credentials for Azure Stack Hub] * xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[Manually creating long-term credentials for GCP] * xref:../../updating/preparing_for_updates/preparing-manual-creds-update.adoc#cco-manual-upgrade-annotation_preparing-manual-creds-update[Indicating that the cluster is ready to upgrade]