Skip to content

Commit 4774f53

Browse files
authored
Merge pull request #101307 from brendan-daly-red-hat/OSDOCS-16899
OSDOCS-16899#combining assemblies
2 parents e5299bc + 17d8d1c commit 4774f53

21 files changed

+26
-66
lines changed

_topic_maps/_topic_map.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@ Topics:
363363
File: user-managed-encryption-ibm-cloud
364364
- Name: Installing a cluster on IBM Cloud with customizations
365365
File: installing-ibm-cloud-customizations
366-
- Name: Installing a cluster on IBM Cloud with network customizations
367-
File: installing-ibm-cloud-network-customizations
368366
- Name: Installing a cluster on IBM Cloud into an existing VPC
369367
File: installing-ibm-cloud-vpc
370368
- Name: Installing a private cluster on IBM Cloud

installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
In {product-title} version {product-version}, you can install a customized cluster on infrastructure that the installation program provisions on {ibm-cloud-name}. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster.
9+
In {product-title} version {product-version}, you can install a customized cluster
10+
on {ibm-cloud-name} by using installer-provisioned infrastructure with customizations, including network configuration options. In each, you modify parameters in the `install-config.yaml` file before you install the cluster.
11+
12+
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.
13+
14+
You must set most of the network configuration parameters during installation, and you can modify only `kubeProxy` configuration parameters in a running cluster.
1015

1116
[id="prerequisites_installing-ibm-cloud-customizations"]
1217
== Prerequisites
@@ -50,6 +55,11 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5055

5156
include::modules/manually-create-iam-ibm-cloud.adoc[leveloffset=+1]
5257

58+
// Network Operator specific configuration
59+
include::modules/nw-network-config.adoc[leveloffset=+1]
60+
include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
61+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
62+
5363
include::modules/installation-launching-installer.adoc[leveloffset=+1]
5464

5565
include::modules/cli-installing-cli.adoc[leveloffset=+1]

installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ customized network configuration on infrastructure that the installation program
1111

1212
You must set most of the network configuration parameters during installation, and you can modify only `kubeProxy` configuration parameters in a running cluster.
1313

14-
[id="prerequisites_installing-ibm-cloud-network-customizations"]
14+
[id="prerequisites_installing-ibm-cloud-customizations"]
1515
== Prerequisites
1616

1717
* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
@@ -65,18 +65,18 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
6565
include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
6666

6767
[role="_additional-resources"]
68-
[id="additional-resources_installing-ibm-cloud-network-customizations-console"]
68+
[id="additional-resources_installing-ibm-cloud-customizations-console"]
6969
.Additional resources
7070
* xref:../../web_console/web-console.adoc#web-console[Accessing the web console]
7171

7272
include::modules/cluster-telemetry.adoc[leveloffset=+1]
7373

7474
[role="_additional-resources"]
75-
[id="additional-resources_installing-ibm-cloud-network-customizations-telemetry"]
75+
[id="additional-resources_installing-ibm-cloud-customizations-telemetry"]
7676
.Additional resources
7777
* xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]
7878

79-
[id="next-steps_installing-ibm-cloud-network-customizations"]
79+
[id="next-steps_installing-ibm-cloud-customizations"]
8080
== Next steps
8181

8282
* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster].

installing/installing_ibm_cloud/preparing-to-install-on-ibm-cloud.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can install a cluster on {ibm-cloud-name} infrastructure that is provisioned
1717

1818
* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a customized cluster on {ibm-cloud-name}]**: You can install a customized cluster on {ibm-cloud-name} infrastructure that the installation program provisions. The installation program allows for some customization to be applied at the installation stage. Many other customization options are available xref:../../post_installation_configuration/cluster-tasks.adoc#post-install-cluster-tasks[post-installation].
1919

20-
* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[Installing a cluster on {ibm-cloud-name} with network customizations]**: You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements.
20+
* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-name} with network customizations]**: You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements.
2121

2222
* **xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[Installing a cluster on {ibm-cloud-name} into an existing VPC]**: You can install {product-title} on an existing {ibm-cloud-name}. You can use this installation method if you have constraints set by the guidelines of your company, such as limits when creating new accounts or infrastructure.
2323

installing/installing_ibm_cloud/user-managed-encryption-ibm-cloud.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ Make sure you have integrated Key Protect with your {ibm-cloud-title} Block Stor
3737
Install an {product-title} cluster:
3838

3939
* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-title} with customizations]
40-
* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[Installing a cluster on {ibm-cloud-title} with network customizations]
40+
* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[Installing a cluster on {ibm-cloud-title} with network customizations]
4141
* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc#installing-ibm-cloud-vpc[Installing a cluster on {ibm-cloud-title} into an existing VPC]
4242
* xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc#installing-ibm-cloud-private[Installing a private cluster on {ibm-cloud-title}]

installing/overview/installing-preparing.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ ifndef::openshift-origin[]
185185
|xref:../../installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc#configuring-host-network-interfaces-in-the-install-config-yaml-file_ipi-install-installation-workflow[✓]
186186
|xref:../../installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc#configuring-host-network-interfaces-in-the-install-config-yaml-file_ipi-install-installation-workflow[✓]
187187
|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓]
188-
|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓]
189-
|
188+
|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓]
190189
|
190+
191191
|
192192

193193
|Restricted network
@@ -341,7 +341,7 @@ ifdef::openshift-origin[]
341341
|
342342
|
343343
|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓]
344-
|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓]
344+
|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc#installing-ibm-cloud-customizations[✓]
345345
|
346346
|
347347

modules/cli-installing-cli.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
// * installing/installing_gcp/installing-gcp-user-infra.adoc
2828
// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
2929
// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc
30-
// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
3130
// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc
3231
// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc
3332
// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc

modules/cli-logging-in-kubeadmin.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
// * installing/installing_gcp/installing-restricted-networks-gcp.adoc
3131
// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
3232
// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc
33-
// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
3433
// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc
3534
// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc
3635
// * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc

modules/cluster-telemetry.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
// * installing/installing_gcp/installing-gcp-vpc.adoc
5151
// * installing/installing_gcp/installing-gcp-network-customizations.adoc
5252
// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc
53-
// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
5453
// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc
5554
// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc
5655
// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc

modules/installation-configure-proxy.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
// * installing/installing_gcp/installing-restricted-networks-gcp.adoc
2525
// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
2626
// * installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc
27-
// * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
2827
// * installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc
2928
// * installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc
3029
// * installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc

0 commit comments

Comments
 (0)