Skip to content

Commit d407285

Browse files
authored
Merge pull request #42670 from tmalove/TL-osdocs-3179
OSDOCS-2950: Adding support default IPI cluster installation to Azure
2 parents c100619 + 59e90b8 commit d407285

15 files changed

+163
-13
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ Topics:
187187
File: installing-azure-stack-hub-account
188188
- Name: Installing a cluster on Azure Stack Hub with an installer-provisioned infrastructure
189189
File: installing-azure-stack-hub-default
190+
- Name: Installing a cluster on Azure Stack Hub with network customizations
191+
File: installing-azure-stack-hub-network-customizations
190192
- Name: Installing a cluster on Azure Stack Hub using ARM templates
191193
File: installing-azure-stack-hub-user-infra
192194
- Name: Uninstalling a cluster on Azure Stack Hub

installing/installing-preparing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ endif::openshift-origin[]
163163
|xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X]
164164
|xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X]
165165
|xref:../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[X]
166-
|
166+
|xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[X]
167167
|xref:../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[X]
168168
|xref:../installing/installing_openstack/installing-openstack-installer-kuryr.adoc#installing-openstack-installer-kuryr[X]
169169
|
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
[id="installing-azure-stack-hub-network-customizations"]
2+
= Installing a cluster on Azure Stack Hub with network customizations
3+
include::_attributes/common-attributes.adoc[]
4+
:context: installing-azure-stack-hub-network-customizations
5+
6+
toc::[]
7+
8+
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.
9+
10+
[NOTE]
11+
====
12+
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.
13+
====
14+
15+
[id="prerequisites_installing-azure-stack-hub-network-customizations"]
16+
== Prerequisites
17+
18+
* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
19+
* You read the documentation on xref:../../installing/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
20+
* 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.
21+
* 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.
22+
* 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.
23+
24+
include::modules/cluster-entitlements.adoc[leveloffset=+1]
25+
26+
include::modules/ssh-agent-using.adoc[leveloffset=+1]
27+
28+
include::modules/installation-azure-user-infra-uploading-rhcos.adoc[leveloffset=+1]
29+
30+
include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
31+
32+
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
33+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
34+
include::modules/installation-azure-stack-hub-config-yaml.adoc[leveloffset=+2]
35+
36+
include::modules/manually-create-identity-access-management.adoc[leveloffset=+1]
37+
38+
[role="_additional-resources"]
39+
[id="additional-resources_installing-azure-stack-hub-network-customizations-cco"]
40+
.Additional resources
41+
* xref:../../updating/updating-cluster-within-minor.adoc#manually-maintained-credentials-upgrade_updating-cluster-within-minor[Updating a cluster within a minor version using the web console]
42+
* xref:../../updating/updating-cluster-cli.adoc#manually-maintained-credentials-upgrade_updating-cluster-cli[Updating a cluster within a minor version using the CLI]
43+
44+
include::modules/azure-stack-hub-internal-ca.adoc[leveloffset=+1]
45+
46+
//include::modules/installation-launching-installer.adoc[leveloffset=+1]
47+
//Leaving this stubbed in case future might remove the requirement to manually configure the install configuration file.
48+
49+
// Network Operator specific configuration
50+
include::modules/nw-network-config.adoc[leveloffset=+1]
51+
include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
52+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
53+
include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
54+
55+
[NOTE]
56+
====
57+
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].
58+
====
59+
include::modules/installation-launching-installer.adoc[leveloffset=+1]
60+
61+
include::modules/cli-installing-cli.adoc[leveloffset=+1]
62+
63+
include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
64+
65+
include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
66+
67+
[role="_additional-resources"]
68+
[id="additional-resources_installing-azure-stack-hub-network-customizations-console"]
69+
.Additional resources
70+
* xref:../../web_console/web-console.adoc#web-console[Accessing the web console].
71+
72+
include::modules/cluster-telemetry.adoc[leveloffset=+1]
73+
74+
[role="_additional-resources"]
75+
[id="additional-resources_installing-azure-stack-hub-network-customizations-telemetry"]
76+
.Additional resources
77+
* xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]
78+
79+
[id="next-steps_installing-azure-stack-hub-network-customizations"]
80+
== Next steps
81+
82+
* xref:../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].
83+
* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster].
84+
* 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].
85+
* If necessary, you can xref:../../authentication/managing_cloud_provider_credentials/cco-mode-mint.adoc#manually-removing-cloud-creds_cco-mode-mint[remove cloud provider credentials].

modules/cluster-entitlements.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
// * installing/installing_vmc/installing-vmc.adoc
6969
// * installing/installing_ibm_power/installing-ibm-power.adoc
7070
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
71+
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
7172
// * architecture/architecture.adoc
7273

7374
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]

modules/configuring-hybrid-ovnkubernetes.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//
33
// * installing/installing_aws/installing-aws-network-customizations.adoc
44
// * installing/installing_azure/installing-azure-network-customizations.adoc
5+
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
56
// * networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc
67

78
:_content-type: PROCEDURE

modules/installation-azure-stack-hub-config-yaml.adoc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ endif::[]
99
ifeval::["{context}" == "installing-azure-stack-hub-default"]
1010
:ash-default:
1111
endif::[]
12+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
13+
:ash-network:
14+
endif::[]
1215

1316
[id="installation-azure-stack-hub-config-yaml_{context}"]
1417
= Sample customized install-config.yaml file for Azure Stack Hub
@@ -102,7 +105,7 @@ For production {product-title} clusters on which you want to perform installatio
102105
====
103106
endif::ash[]
104107

105-
ifdef::ash-default[]
108+
ifdef::ash-default,ash-network[]
106109
[source,yaml]
107110
----
108111
apiVersion: v1
@@ -192,11 +195,14 @@ ifdef::openshift-origin[]
192195
<12> If the Azure Stack Hub environment is using an internal Certificate Authority (CA), adding the CA certificate is required.
193196
endif::openshift-origin[]
194197

195-
endif::ash-default[]
198+
endif::ash-default,ash-network[]
196199

197200
ifeval::["{context}" == "installing-azure-stack-hub-user-infra"]
198201
:!ash:
199202
endif::[]
200203
ifeval::["{context}" == "installing-azure-stack-hub-default"]
201204
:!ash-default:
202205
endif::[]
206+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
207+
:!ash-network:
208+
endif::[]

modules/installation-azure-user-infra-uploading-rhcos.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ endif::[]
1313
ifeval::["{context}" == "installing-azure-stack-hub-default"]
1414
:ash-ipi:
1515
endif::[]
16+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
17+
:ash-ipi:
18+
endif::[]
1619

1720
:_content-type: PROCEDURE
1821
[id="installation-azure-user-infra-uploading-rhcos_{context}"]
@@ -171,3 +174,6 @@ endif::[]
171174
ifeval::["{context}" == "installing-azure-stack-hub-default"]
172175
:!ash-ipi:
173176
endif::[]
177+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
178+
:!ash-ipi:
179+
endif::[]

modules/installation-configuration-parameters.adoc

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
4646
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
4747
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc
48+
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-customizations.adoc
4849

4950
ifeval::["{context}" == "installing-aws-customizations"]
5051
:aws:
@@ -192,7 +193,10 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
192193
:ibm-power:
193194
endif::[]
194195
ifeval::["{context}" == "installing-azure-stack-hub-default"]
195-
:ash-default:
196+
:ash:
197+
endif::[]
198+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
199+
:ash:
196200
endif::[]
197201

198202
:_content-type: CONCEPT
@@ -269,6 +273,7 @@ endif::[]
269273

270274
|====
271275

276+
ifndef::ash-default[]
272277
[id="installation-configuration-parameters-network_{context}"]
273278
== Network configuration parameters
274279

@@ -448,7 +453,9 @@ Set the `networking.machineNetwork` to match the CIDR that the preferred NIC res
448453
====
449454

450455
|====
456+
endif::ash-default[]
451457

458+
ifndef::ash-default[]
452459
[id="installation-configuration-parameters-optional_{context}"]
453460
== Optional configuration parameters
454461

@@ -618,6 +625,7 @@ For production {product-title} clusters on which you want to perform installatio
618625
a|For example, `sshKey: ssh-ed25519 AAAA..`.
619626

620627
|====
628+
endif::ash-default[]
621629

622630
ifdef::aws[]
623631
[id="installation-configuration-parameters-optional-aws_{context}"]
@@ -1519,5 +1527,8 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
15191527
:!ibm-power:
15201528
endif::[]
15211529
ifeval::["{context}" == "installing-azure-stack-hub-default"]
1522-
:!ash-default:
1530+
:!ash:
1531+
endif::[]
1532+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
1533+
:!ash:
15231534
endif::[]

modules/installation-initializing-manual.adoc

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// * installing/installing_vsphere/installing-vsphere.adoc
1919
// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
2020
// * installing/installing_ibm_z/installing-ibm-z.adoc
21+
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
2122

2223
ifeval::["{context}" == "installing-azure-government-region"]
2324
:azure-gov:
@@ -55,14 +56,17 @@ endif::[]
5556
ifeval::["{context}" == "installing-azure-stack-hub-default"]
5657
:ash-default:
5758
endif::[]
59+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
60+
:ash-network:
61+
endif::[]
5862

5963
:_content-type: PROCEDURE
6064
[id="installation-initializing-manual_{context}"]
6165
= Manually creating the installation configuration file
6266

63-
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,ash-default[]
67+
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,ash-default,ash-network[]
6468
For user-provisioned installations of {product-title}, you manually generate your installation configuration file.
65-
endif::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,ash-default[]
69+
endif::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,ash-default,ash-network[]
6670
ifdef::aws-china,aws-gov,aws-secret[]
6771
Installing the cluster requires that you manually generate the installation configuration file.
6872
//Made this update as part of feedback in PR3961. tl;dr Simply state you have to create the config file, instead of creating a number of conditions to explain why.
@@ -74,9 +78,9 @@ endif::azure-gov[]
7478
ifdef::aws-private,azure-private,gcp-private[]
7579
For installations of a private {product-title} cluster that are only accessible from an internal network and are not visible to the internet, you must manually generate your installation configuration file.
7680
endif::aws-private,azure-private,gcp-private[]
77-
ifdef::ash-default[]
81+
ifdef::ash-default,ash-network[]
7882
When installing {product-title} on Microsoft Azure Stack Hub, you must manually create your installation configuration file.
79-
endif::ash-default[]
83+
endif::ash-default,ash-network[]
8084

8185
.Prerequisites
8286

@@ -128,12 +132,12 @@ mirror the repository.
128132
endif::restricted[]
129133
+
130134

131-
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,ash-default[]
135+
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,ash-default,ash-network[]
132136
[NOTE]
133137
====
134138
For some platform types, you can alternatively run `./openshift-install create install-config --dir <installation_directory>` to generate an `install-config.yaml` file. You can provide details about your cluster configuration at the prompts.
135139
====
136-
endif::aws-china,aws-gov,aws-secret,azure-gov,ash,ash-default[]
140+
endif::aws-china,aws-gov,aws-secret,azure-gov,ash,ash-default,ash-network[]
137141
ifdef::ash[]
138142
+
139143
Make the following modifications for Azure Stack Hub:
@@ -169,7 +173,7 @@ platform:
169173
<4> Specify the name of your Azure Stack Hub region.
170174
endif::ash[]
171175

172-
ifdef::ash-default[]
176+
ifdef::ash-default,ash-network[]
173177
+
174178
Make the following modifications:
175179

@@ -180,7 +184,7 @@ Make the following modifications:
180184
.. Optional: Update one or more of the default configuration parameters to customize the installation.
181185
+
182186
For more information about the parameters, see "Installation configuration parameters".
183-
endif::ash-default[]
187+
endif::ash-default,ash-network[]
184188

185189
. Back up the `install-config.yaml` file so that you can use it to install
186190
multiple clusters.
@@ -227,3 +231,6 @@ endif::[]
227231
ifeval::["{context}" == "installing-azure-stack-hub-default"]
228232
:!ash-default:
229233
endif::[]
234+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
235+
:!ash-network:
236+
endif::[]

modules/installation-launching-installer.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ ifeval::["{context}" == "installing-azure-stack-hub-default"]
106106
:custom-config:
107107
:ash:
108108
endif::[]
109+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
110+
:custom-config:
111+
:ash:
112+
endif::[]
109113
ifeval::["{context}" == "installing-openstack-installer-custom"]
110114
:osp:
111115
:custom-config:
@@ -516,6 +520,10 @@ ifeval::["{context}" == "installing-azure-stack-hub-default"]
516520
:!custom-config:
517521
:!ash:
518522
endif::[]
523+
ifeval::["{context}" == "installing-azure-stack-hub-network-customizations"]
524+
:!custom-config:
525+
:!ash:
526+
endif::[]
519527
ifeval::["{context}" == "installing-openstack-installer-custom"]
520528
:!osp:
521529
:!custom-config:

0 commit comments

Comments
 (0)