Skip to content

Commit f06267f

Browse files
dfitzmaudfitzmau
committed
OCPBUGS-52572: Removed DAY-2 limitation for internalJoinSubnet and internalTransitSwitchSubnet
1 parent c3cf9bb commit f06267f

File tree

9 files changed

+24
-48
lines changed

9 files changed

+24
-48
lines changed

‎openapi/generated_openapi/zz_generated.openapi.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openapi/openapi.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29711,11 +29711,11 @@
2971129711
"type": "object",
2971229712
"properties": {
2971329713
"internalJoinSubnet": {
29714-
"description": "internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. The current default value is 100.64.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
29714+
"description": "internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The current default value is 100.64.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
2971529715
"type": "string"
2971629716
},
2971729717
"internalTransitSwitchSubnet": {
29718-
"description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 100.88.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
29718+
"description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 100.88.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
2971929719
"type": "string"
2972029720
}
2972129721
}
@@ -29734,11 +29734,11 @@
2973429734
"type": "object",
2973529735
"properties": {
2973629736
"internalJoinSubnet": {
29737-
"description": "internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. The subnet must be large enough to accomadate one IP per node in your cluster The current default value is fd98::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
29737+
"description": "internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The subnet must be large enough to accomadate one IP per node in your cluster The current default value is fd98::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
2973829738
"type": "string"
2973929739
},
2974029740
"internalTransitSwitchSubnet": {
29741-
"description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The subnet must be large enough to accomadate one IP per node in your cluster The current default subnet is fd97::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
29741+
"description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The subnet must be large enough to accomadate one IP per node in your cluster The current default subnet is fd97::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
2974229742
"type": "string"
2974329743
}
2974429744
}

‎operator/v1/types_network.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ type IPv4OVNKubernetesConfig struct {
478478
// architecture that connects the cluster routers on each node together to enable
479479
// east west traffic. The subnet chosen should not overlap with other networks
480480
// specified for OVN-Kubernetes as well as other networks used on the host.
481-
// The value cannot be changed after installation.
482481
// When ommitted, this means no opinion and the platform is left to choose a reasonable
483482
// default which is subject to change over time.
484483
// The current default subnet is 100.88.0.0/16
@@ -493,8 +492,7 @@ type IPv4OVNKubernetesConfig struct {
493492
// internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the
494493
// default one is being already used by something else. It must not overlap with
495494
// any other subnet being used by OpenShift or by the node network. The size of the
496-
// subnet must be larger than the number of nodes. The value cannot be changed
497-
// after installation.
495+
// subnet must be larger than the number of nodes.
498496
// The current default value is 100.64.0.0/16
499497
// The subnet must be large enough to accomadate one IP per node in your cluster
500498
// The value must be in proper IPV4 CIDR format
@@ -512,7 +510,6 @@ type IPv6OVNKubernetesConfig struct {
512510
// architecture that connects the cluster routers on each node together to enable
513511
// east west traffic. The subnet chosen should not overlap with other networks
514512
// specified for OVN-Kubernetes as well as other networks used on the host.
515-
// The value cannot be changed after installation.
516513
// When ommitted, this means no opinion and the platform is left to choose a reasonable
517514
// default which is subject to change over time.
518515
// The subnet must be large enough to accomadate one IP per node in your cluster
@@ -527,8 +524,7 @@ type IPv6OVNKubernetesConfig struct {
527524
// internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the
528525
// default one is being already used by something else. It must not overlap with
529526
// any other subnet being used by OpenShift or by the node network. The size of the
530-
// subnet must be larger than the number of nodes. The value cannot be changed
531-
// after installation.
527+
// subnet must be larger than the number of nodes.
532528
// The subnet must be large enough to accomadate one IP per node in your cluster
533529
// The current default value is fd98::/64
534530
// The value must be in proper IPV6 CIDR format

‎operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,7 @@ spec:
466466
internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the
467467
default one is being already used by something else. It must not overlap with
468468
any other subnet being used by OpenShift or by the node network. The size of the
469-
subnet must be larger than the number of nodes. The value cannot be changed
470-
after installation.
469+
subnet must be larger than the number of nodes.
471470
The current default value is 100.64.0.0/16
472471
The subnet must be large enough to accomadate one IP per node in your cluster
473472
The value must be in proper IPV4 CIDR format
@@ -487,7 +486,6 @@ spec:
487486
architecture that connects the cluster routers on each node together to enable
488487
east west traffic. The subnet chosen should not overlap with other networks
489488
specified for OVN-Kubernetes as well as other networks used on the host.
490-
The value cannot be changed after installation.
491489
When ommitted, this means no opinion and the platform is left to choose a reasonable
492490
default which is subject to change over time.
493491
The current default subnet is 100.88.0.0/16
@@ -514,8 +512,7 @@ spec:
514512
internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the
515513
default one is being already used by something else. It must not overlap with
516514
any other subnet being used by OpenShift or by the node network. The size of the
517-
subnet must be larger than the number of nodes. The value cannot be changed
518-
after installation.
515+
subnet must be larger than the number of nodes.
519516
The subnet must be large enough to accomadate one IP per node in your cluster
520517
The current default value is fd98::/64
521518
The value must be in proper IPV6 CIDR format
@@ -534,7 +531,6 @@ spec:
534531
architecture that connects the cluster routers on each node together to enable
535532
east west traffic. The subnet chosen should not overlap with other networks
536533
specified for OVN-Kubernetes as well as other networks used on the host.
537-
The value cannot be changed after installation.
538534
When ommitted, this means no opinion and the platform is left to choose a reasonable
539535
default which is subject to change over time.
540536
The subnet must be large enough to accomadate one IP per node in your cluster

‎operator/v1/zz_generated.featuregated-crd-manifests/networks.operator.openshift.io/AAA_ungated.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@ spec:
434434
internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the
435435
default one is being already used by something else. It must not overlap with
436436
any other subnet being used by OpenShift or by the node network. The size of the
437-
subnet must be larger than the number of nodes. The value cannot be changed
438-
after installation.
437+
subnet must be larger than the number of nodes.
439438
The current default value is 100.64.0.0/16
440439
The subnet must be large enough to accomadate one IP per node in your cluster
441440
The value must be in proper IPV4 CIDR format
@@ -455,7 +454,6 @@ spec:
455454
architecture that connects the cluster routers on each node together to enable
456455
east west traffic. The subnet chosen should not overlap with other networks
457456
specified for OVN-Kubernetes as well as other networks used on the host.
458-
The value cannot be changed after installation.
459457
When ommitted, this means no opinion and the platform is left to choose a reasonable
460458
default which is subject to change over time.
461459
The current default subnet is 100.88.0.0/16
@@ -482,8 +480,7 @@ spec:
482480
internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the
483481
default one is being already used by something else. It must not overlap with
484482
any other subnet being used by OpenShift or by the node network. The size of the
485-
subnet must be larger than the number of nodes. The value cannot be changed
486-
after installation.
483+
subnet must be larger than the number of nodes.
487484
The subnet must be large enough to accomadate one IP per node in your cluster
488485
The current default value is fd98::/64
489486
The value must be in proper IPV6 CIDR format
@@ -502,7 +499,6 @@ spec:
502499
architecture that connects the cluster routers on each node together to enable
503500
east west traffic. The subnet chosen should not overlap with other networks
504501
specified for OVN-Kubernetes as well as other networks used on the host.
505-
The value cannot be changed after installation.
506502
When ommitted, this means no opinion and the platform is left to choose a reasonable
507503
default which is subject to change over time.
508504
The subnet must be large enough to accomadate one IP per node in your cluster

0 commit comments

Comments
 (0)