Skip to content

Commit b177151

Browse files
authored
Merge pull request #39757 from kquinn1204/BZ-2029667
BZ-2029667: Updating networking.MachineCIDR to networking.machineNetwork[].cidr first draft
2 parents db4a434 + 99ff2b4 commit b177151

5 files changed

+10
-5
lines changed

modules/install-ibm-cloud-configuring-the-install-config-file.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ baseDomain: <domain>
1818
metadata:
1919
name: <cluster_name>
2020
networking:
21-
machineCIDR: <public_cidr>
21+
machineNetwork:
22+
- cidr: <public-cidr>
2223
networkType: OVNKubernetes
2324
compute:
2425
- name: worker

modules/installation-osp-restricted-config-yaml.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ networking:
3434
clusterNetwork:
3535
- cidr: 10.128.0.0/14
3636
hostPrefix: 23
37-
machineCIDR: 10.0.0.0/16
37+
machineNetwork:
38+
- cidr: 10.0.0.0/16
3839
serviceNetwork:
3940
- 172.30.0.0/16
4041
ifndef::openshift-origin[]

modules/ipi-install-additional-install-config-parameters.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ metadata:
4343
a|
4444
----
4545
networking:
46-
machineCIDR:
46+
machineNetwork:
47+
- cidr:
4748
----
4849
|
4950
|The public CIDR (Classless Inter-Domain Routing) of the external network. For example, `10.0.0.0/24`

modules/ipi-install-configuring-the-install-config-file.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ baseDomain: <domain>
1818
metadata:
1919
name: <cluster-name>
2020
networking:
21-
machineCIDR: <public-cidr>
21+
machineNetwork:
22+
- cidr: <public-cidr>
2223
networkType: OVNKubernetes
2324
compute:
2425
- name: worker

modules/recommended-install-practices.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ networking:
1515
clusterNetwork:
1616
- cidr: 10.128.0.0/14
1717
hostPrefix: 23
18-
machineCIDR: 10.0.0.0/16
18+
machineNetwork:
19+
- cidr: 10.0.0.0/16
1920
networkType: OpenShiftSDN
2021
serviceNetwork:
2122
- 172.30.0.0/16

0 commit comments

Comments
 (0)