Skip to content

WIP: OCPBUGS-52572: Removed DAY-2 limitation for internalJoinSubnet and in… #2380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

WIP: OCPBUGS-52572: Removed DAY-2 limitation for internalJoinSubnet and in… #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29711,11 +29711,11 @@
"type": "object",
"properties": {
"internalJoinSubnet": {
"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",
"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 accommodate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
Copy link

@kquinn1204 kquinn1204 Jun 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: accomadate should be: accommodate

"type": "string"
},
"internalTransitSwitchSubnet": {
"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",
"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 accommodate one IP per node in your cluster The value must be in proper IPV4 CIDR format",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: accomadate should be: accommodate

"type": "string"
}
}
Expand All @@ -29734,11 +29734,11 @@
"type": "object",
"properties": {
"internalJoinSubnet": {
"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",
"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 accommodate 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",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accomadate should be accommodate

"type": "string"
},
"internalTransitSwitchSubnet": {
"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",
"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 accommodate 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",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accomadate should be accommodate

"type": "string"
}
}
Expand Down
16 changes: 6 additions & 10 deletions operator/v1/types_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,11 +478,10 @@ type IPv4OVNKubernetesConfig struct {
// 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 subnet must be large enough to accommodate one IP per node in your cluster
// The value must be in proper IPV4 CIDR format
// +kubebuilder:validation:MaxLength=18
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 4",message="Subnet must be in valid IPV4 CIDR format"
Expand All @@ -493,10 +492,9 @@ type IPv4OVNKubernetesConfig struct {
// 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.
// 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 subnet must be large enough to accommodate one IP per node in your cluster
// The value must be in proper IPV4 CIDR format
// +kubebuilder:validation:MaxLength=18
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 4",message="Subnet must be in valid IPV4 CIDR format"
Expand All @@ -512,10 +510,9 @@ type IPv6OVNKubernetesConfig struct {
// 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 subnet must be large enough to accommodate 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
Expand All @@ -527,9 +524,8 @@ type IPv6OVNKubernetesConfig struct {
// 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
// subnet must be larger than the number of nodes.
// The subnet must be large enough to accommodate 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
Expand Down
16 changes: 6 additions & 10 deletions operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,9 @@ spec:
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.
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 subnet must be large enough to accommodate one IP per node in your cluster
The value must be in proper IPV4 CIDR format
maxLength: 18
type: string
Expand All @@ -487,11 +486,10 @@ spec:
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 subnet must be large enough to accommodate one IP per node in your cluster
The value must be in proper IPV4 CIDR format
maxLength: 18
type: string
Expand All @@ -514,9 +512,8 @@ spec:
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
subnet must be larger than the number of nodes.
The subnet must be large enough to accommodate 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
Expand All @@ -534,10 +531,9 @@ spec:
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 subnet must be large enough to accommodate 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
Expand Down
Loading