Skip to content

Commit b762635

Browse files
jab-rhjab-rh
authored
Merge pull request #54319 from jboxman-rh/yamls_ovn_default
Change default networktype to OVNKubernetes
2 parents 14bbab4 + 34d4948 commit b762635

17 files changed

+335
-393
lines changed

‎modules/installation-alibaba-config-yaml.adoc

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,26 @@ metadata:
3737
hostPrefix: 23
3838
machineNetwork:
3939
- cidr: 10.0.0.0/16
40-
networkType: OpenShiftSDN
40+
networkType: OVNKubernetes <2>
4141
serviceNetwork:
4242
- 172.30.0.0/16
4343
platform:
4444
alibabacloud:
45-
defaultMachinePlatform: <2>
45+
defaultMachinePlatform: <3>
4646
instanceType: ecs.g6.xlarge
4747
systemDiskCategory: cloud_efficiency
4848
systemDiskSize: 200
49-
region: ap-southeast-1 <3>
50-
resourceGroupID: rg-acfnw6j3hyai <4>
49+
region: ap-southeast-1 <4>
50+
resourceGroupID: rg-acfnw6j3hyai <5>
5151
publish: External
52-
pullSecret: '{"auths": {"cloud.openshift.com": {"auth": ... }' <5>
52+
pullSecret: '{"auths": {"cloud.openshift.com": {"auth": ... }' <6>
5353
sshKey: |
54-
ssh-rsa AAAA... <6>
54+
ssh-rsa AAAA... <7>
5555
----
5656
<1> Required. The installation program prompts you for a cluster name.
57-
<2> Optional. Specify parameters for machine pools that do not define their own platform configuration.
58-
<3> Required. The installation program prompts you for the region to deploy the cluster to.
59-
<4> Optional. Specify an existing resource group where the cluster should be installed.
60-
<5> Required. The installation program prompts you for the pull secret.
61-
<6> Optional. The installation program prompts you for the SSH key value that you use to access the machines in your cluster.
57+
<2> The cluster network plugin to install. The supported values are `OVNKubernetes` and `OpenShiftSDN`. The default value is `OVNKubernetes`.
58+
<3> Optional. Specify parameters for machine pools that do not define their own platform configuration.
59+
<4> Required. The installation program prompts you for the region to deploy the cluster to.
60+
<5> Optional. Specify an existing resource group where the cluster should be installed.
61+
<6> Required. The installation program prompts you for the pull secret.
62+
<7> Optional. The installation program prompts you for the SSH key value that you use to access the machines in your cluster.

‎modules/installation-aws-config-yaml.adoc

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,7 @@ endif::[]
139139
hostPrefix: 23
140140
machineNetwork:
141141
- cidr: 10.0.0.0/16
142-
ifndef::openshift-origin[]
143-
networkType: OpenShiftSDN
144-
endif::openshift-origin[]
145-
ifdef::openshift-origin[]
146-
networkType: OVNKubernetes
147-
endif::openshift-origin[]
142+
networkType: OVNKubernetes <8>
148143
serviceNetwork:
149144
- 172.30.0.0/16
150145
platform:
@@ -169,94 +164,94 @@ endif::secret[]
169164
adminContact: jdoe
170165
costCenter: 7536
171166
ifdef::vpc,restricted[]
172-
subnets: <8>
167+
subnets: <9>
173168
- subnet-1
174169
- subnet-2
175170
- subnet-3
176171
ifndef::secret,china[]
177-
amiID: ami-96c6f8f7 <9>
172+
amiID: ami-96c6f8f7 <10>
178173
endif::secret,china[]
179174
ifdef::secret,china[]
180-
amiID: ami-96c6f8f7 <1> <9>
175+
amiID: ami-96c6f8f7 <1> <10>
181176
endif::secret,china[]
182-
serviceEndpoints: <10>
177+
serviceEndpoints: <11>
183178
- name: ec2
184179
ifndef::china[]
185180
url: https://vpce-id.ec2.us-west-2.vpce.amazonaws.com
186181
endif::china[]
187182
ifdef::china[]
188183
url: https://vpce-id.ec2.cn-north-1.vpce.amazonaws.com.cn
189184
endif::china[]
190-
hostedZone: Z3URY6TWQ91KVV <11>
185+
hostedZone: Z3URY6TWQ91KVV <12>
191186
endif::vpc,restricted[]
192187
ifndef::vpc,restricted[]
193-
amiID: ami-96c6f8f7 <8>
194-
serviceEndpoints: <9>
188+
amiID: ami-96c6f8f7 <9>
189+
serviceEndpoints: <10>
195190
- name: ec2
196191
url: https://vpce-id.ec2.us-west-2.vpce.amazonaws.com
197192
endif::vpc,restricted[]
198193
ifdef::vpc,restricted[]
199194
ifndef::openshift-origin[]
200-
fips: false <12>
201-
sshKey: ssh-ed25519 AAAA... <13>
195+
fips: false <13>
196+
sshKey: ssh-ed25519 AAAA... <14>
202197
endif::openshift-origin[]
203198
ifdef::openshift-origin[]
204-
sshKey: ssh-ed25519 AAAA... <12>
199+
sshKey: ssh-ed25519 AAAA... <13>
205200
endif::openshift-origin[]
206201
endif::vpc,restricted[]
207202
ifndef::vpc,restricted[]
208203
ifndef::openshift-origin[]
209-
fips: false <10>
210-
sshKey: ssh-ed25519 AAAA... <11>
204+
fips: false <11>
205+
sshKey: ssh-ed25519 AAAA... <12>
211206
endif::openshift-origin[]
212207
ifdef::openshift-origin[]
213-
sshKey: ssh-ed25519 AAAA... <10>
208+
sshKey: ssh-ed25519 AAAA... <11>
214209
endif::openshift-origin[]
215210
endif::vpc,restricted[]
216211
ifdef::private[]
217212
ifndef::openshift-origin[]
218-
publish: Internal <14>
213+
publish: Internal <15>
219214
endif::openshift-origin[]
220215
endif::private[]
221216
ifndef::restricted[]
222217
pullSecret: '{"auths": ...}' <1>
223218
endif::restricted[]
224219
ifdef::restricted[]
225220
ifndef::openshift-origin[]
226-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <14>
221+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <15>
227222
endif::openshift-origin[]
228223
ifdef::openshift-origin[]
229-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <13>
224+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <14>
230225
endif::openshift-origin[]
231226
endif::restricted[]
232227
ifdef::secret[]
233228
ifndef::openshift-origin[]
234-
additionalTrustBundle: | <15>
229+
additionalTrustBundle: | <16>
235230
-----BEGIN CERTIFICATE-----
236231
<MY_TRUSTED_CA_CERT>
237232
-----END CERTIFICATE-----
238233
endif::openshift-origin[]
239234
endif::secret[]
240235
ifdef::private[]
241236
ifdef::openshift-origin[]
242-
publish: Internal <13>
237+
publish: Internal <14>
243238
endif::openshift-origin[]
244239
endif::private[]
245240
ifdef::secret[]
246241
ifdef::openshift-origin[]
247-
additionalTrustBundle: | <14>
242+
additionalTrustBundle: | <15>
248243
-----BEGIN CERTIFICATE-----
249244
<MY_TRUSTED_CA_CERT>
250245
-----END CERTIFICATE-----
251246
endif::openshift-origin[]
252247
endif::secret[]
253248
ifdef::restricted[]
254249
ifndef::openshift-origin[]
255-
additionalTrustBundle: | <15>
250+
additionalTrustBundle: | <16>
256251
-----BEGIN CERTIFICATE-----
257252
<MY_TRUSTED_CA_CERT>
258253
-----END CERTIFICATE-----
259-
imageContentSources: <16>
254+
imageContentSources: <17>
260255
- mirrors:
261256
- <local_registry>/<local_repository_name>/release
262257
source: quay.io/openshift-release-dev/ocp-release
@@ -265,11 +260,11 @@ imageContentSources: <16>
265260
source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
266261
endif::openshift-origin[]
267262
ifdef::openshift-origin[]
268-
additionalTrustBundle: | <14>
263+
additionalTrustBundle: | <15>
269264
-----BEGIN CERTIFICATE-----
270265
<MY_TRUSTED_CA_CERT>
271266
-----END CERTIFICATE-----
272-
imageContentSources: <15>
267+
imageContentSources: <16>
273268
- mirrors:
274269
- <local_registry>/<local_repository_name>/release
275270
source: quay.io/openshift-release-dev/ocp-release
@@ -315,46 +310,48 @@ storage type as `io1` and set `iops` to `2000`.
315310
The IMDS configuration for control plane machines that is set during cluster installation can only be changed by using the AWS CLI. The IMDS configuration for compute machines can be changed by using compute machine sets.
316311
====
317312
ifdef::vpc,restricted[]
318-
<8> If you provide your own VPC, specify subnets for each availability zone that your cluster uses.
319-
<9> The ID of the AMI used to boot machines for the cluster. If set, the AMI
313+
<8> The cluster network plugin to install. The supported values are `OVNKubernetes` and `OpenShiftSDN`. The default value is `OVNKubernetes`.
314+
<9> If you provide your own VPC, specify subnets for each availability zone that your cluster uses.
315+
<10> The ID of the AMI used to boot machines for the cluster. If set, the AMI
320316
must belong to the same region as the cluster.
321-
<10> The AWS service endpoints. Custom endpoints are required when installing to
317+
<11> The AWS service endpoints. Custom endpoints are required when installing to
322318
an unknown AWS region. The endpoint URL must use the `https` protocol and the
323319
host must trust the certificate.
324-
<11> The ID of your existing Route 53 private hosted zone. Providing an existing hosted zone requires that you supply your own VPC and the hosted zone is already associated with the VPC prior to installing your cluster. If undefined, the installation program creates a new hosted zone.
320+
<12> The ID of your existing Route 53 private hosted zone. Providing an existing hosted zone requires that you supply your own VPC and the hosted zone is already associated with the VPC prior to installing your cluster. If undefined, the installation program creates a new hosted zone.
325321
ifndef::openshift-origin[]
326-
<12> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
322+
<13> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
327323
+
328324
[IMPORTANT]
329325
====
330326
The use of FIPS Validated / Modules in Process cryptographic libraries is only supported on {product-title} deployments on the `x86_64` architecture.
331327
====
332-
<13> You can optionally provide the `sshKey` value that you use to access the
328+
<14> You can optionally provide the `sshKey` value that you use to access the
333329
machines in your cluster.
334330
endif::openshift-origin[]
335331
ifdef::openshift-origin[]
336-
<12> You can optionally provide the `sshKey` value that you use to access the
332+
<13> You can optionally provide the `sshKey` value that you use to access the
337333
machines in your cluster.
338334
endif::openshift-origin[]
339335
endif::vpc,restricted[]
340336
ifndef::vpc,restricted[]
341-
<8> The ID of the AMI used to boot machines for the cluster. If set, the AMI
337+
<8> The cluster network plugin to install. The supported values are `OVNKubernetes` and `OpenShiftSDN`. The default value is `OVNKubernetes`.
338+
<9> The ID of the AMI used to boot machines for the cluster. If set, the AMI
342339
must belong to the same region as the cluster.
343-
<9> The AWS service endpoints. Custom endpoints are required when installing to
340+
<10> The AWS service endpoints. Custom endpoints are required when installing to
344341
an unknown AWS region. The endpoint URL must use the `https` protocol and the
345342
host must trust the certificate.
346343
ifndef::openshift-origin[]
347-
<10> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
344+
<11> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
348345
+
349346
[IMPORTANT]
350347
====
351348
The use of FIPS Validated / Modules in Process cryptographic libraries is only supported on {product-title} deployments on the `x86_64` architecture.
352349
====
353-
<11> You can optionally provide the `sshKey` value that you use to access the
350+
<12> You can optionally provide the `sshKey` value that you use to access the
354351
machines in your cluster.
355352
endif::openshift-origin[]
356353
ifdef::openshift-origin[]
357-
<10> You can optionally provide the `sshKey` value that you use to access the
354+
<11> You can optionally provide the `sshKey` value that you use to access the
358355
machines in your cluster.
359356
endif::openshift-origin[]
360357
endif::vpc,restricted[]
@@ -365,36 +362,36 @@ For production {product-title} clusters on which you want to perform installatio
365362
====
366363
ifdef::private[]
367364
ifndef::openshift-origin[]
368-
<14> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the internet. The default value is `External`.
365+
<15> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the internet. The default value is `External`.
369366
endif::openshift-origin[]
370367
ifdef::openshift-origin[]
371-
<13> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the internet. The default value is `External`.
368+
<14> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the internet. The default value is `External`.
372369
endif::openshift-origin[]
373370
endif::private[]
374371
ifdef::secret[]
375372
ifndef::openshift-origin[]
376-
<15> The custom CA certificate. This is required when deploying to the SC2S or C2S Regions because the AWS API requires a custom CA trust bundle.
373+
<16> The custom CA certificate. This is required when deploying to the SC2S or C2S Regions because the AWS API requires a custom CA trust bundle.
377374
endif::openshift-origin[]
378375
ifdef::openshift-origin[]
379-
<14> The custom CA certificate. This is required when deploying to the SC2S or C2S Regions because the AWS API requires a custom CA trust bundle.
376+
<15> The custom CA certificate. This is required when deploying to the SC2S or C2S Regions because the AWS API requires a custom CA trust bundle.
380377
endif::openshift-origin[]
381378
endif::secret[]
382379
ifdef::restricted[]
383380
ifndef::openshift-origin[]
384-
<14> For `<local_registry>`, specify the registry domain name, and optionally the
381+
<15> For `<local_registry>`, specify the registry domain name, and optionally the
385382
port, that your mirror registry uses to serve content. For example
386383
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
387384
specify the base64-encoded user name and password for your mirror registry.
388-
<15> Provide the contents of the certificate file that you used for your mirror registry.
389-
<16> Provide the `imageContentSources` section from the output of the command to mirror the repository.
385+
<16> Provide the contents of the certificate file that you used for your mirror registry.
386+
<17> Provide the `imageContentSources` section from the output of the command to mirror the repository.
390387
endif::openshift-origin[]
391388
ifdef::openshift-origin[]
392-
<13> For `<local_registry>`, specify the registry domain name, and optionally the
389+
<14> For `<local_registry>`, specify the registry domain name, and optionally the
393390
port, that your mirror registry uses to serve content. For example
394391
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
395392
specify the base64-encoded user name and password for your mirror registry.
396-
<14> Provide the contents of the certificate file that you used for your mirror registry.
397-
<15> Provide the `imageContentSources` section from the output of the command to mirror the repository.
393+
<15> Provide the contents of the certificate file that you used for your mirror registry.
394+
<16> Provide the `imageContentSources` section from the output of the command to mirror the repository.
398395
endif::openshift-origin[]
399396
endif::restricted[]
400397

0 commit comments

Comments
 (0)