Skip to content

Commit b39c83c

Browse files
committed
Modify api description for join and transit switch subnets
Join and transit switch subnets can be configured at day 2 now and this commit is to modify api description for InternalJoinSubnet and InternalTransitSwitchSubnet to reflect recent changes. Signed-off-by: Arnab Ghosh <[email protected]>
1 parent 3e5de94 commit b39c83c

12 files changed

+92
-92
lines changed

openapi/generated_openapi/zz_generated.openapi.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/openapi.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -27928,11 +27928,11 @@
2792827928
"type": "object",
2792927929
"properties": {
2793027930
"internalJoinSubnet": {
27931-
"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",
27931+
"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 can 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",
2793227932
"type": "string"
2793327933
},
2793427934
"internalTransitSwitchSubnet": {
27935-
"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",
27935+
"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 can 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",
2793627936
"type": "string"
2793727937
}
2793827938
}
@@ -27951,11 +27951,11 @@
2795127951
"type": "object",
2795227952
"properties": {
2795327953
"internalJoinSubnet": {
27954-
"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::/48 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
27954+
"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 can 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::/48 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted",
2795527955
"type": "string"
2795627956
},
2795727957
"internalTransitSwitchSubnet": {
27958-
"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",
27958+
"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 can 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",
2795927959
"type": "string"
2796027960
}
2796127961
}
@@ -30420,11 +30420,11 @@
3042030420
"type": "string"
3042130421
},
3042230422
"v4InternalSubnet": {
30423-
"description": "v4InternalSubnet 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. Default is 100.64.0.0/16",
30423+
"description": "v4InternalSubnet 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 can be changed after installation. Default is 100.64.0.0/16",
3042430424
"type": "string"
3042530425
},
3042630426
"v6InternalSubnet": {
30427-
"description": "v6InternalSubnet 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. Default is fd98::/48",
30427+
"description": "v6InternalSubnet 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 can be changed after installation. Default is fd98::/48",
3042830428
"type": "string"
3042930429
}
3043030430
}

operator/v1/types_network.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -429,16 +429,16 @@ type OVNKubernetesConfig struct {
429429
// v4InternalSubnet is a v4 subnet used internally by ovn-kubernetes in case the
430430
// default one is being already used by something else. It must not overlap with
431431
// any other subnet being used by OpenShift or by the node network. The size of the
432-
// subnet must be larger than the number of nodes. The value cannot be changed
433-
// after installation.
432+
// subnet must be larger than the number of nodes.
433+
// The value can be changed after installation.
434434
// Default is 100.64.0.0/16
435435
// +optional
436436
V4InternalSubnet string `json:"v4InternalSubnet,omitempty"`
437437
// v6InternalSubnet is a v6 subnet used internally by ovn-kubernetes in case the
438438
// default one is being already used by something else. It must not overlap with
439439
// any other subnet being used by OpenShift or by the node network. The size of the
440-
// subnet must be larger than the number of nodes. The value cannot be changed
441-
// after installation.
440+
// subnet must be larger than the number of nodes.
441+
// The value can be changed after installation.
442442
// Default is fd98::/48
443443
// +optional
444444
V6InternalSubnet string `json:"v6InternalSubnet,omitempty"`
@@ -476,7 +476,7 @@ type IPv4OVNKubernetesConfig struct {
476476
// architecture that connects the cluster routers on each node together to enable
477477
// east west traffic. The subnet chosen should not overlap with other networks
478478
// specified for OVN-Kubernetes as well as other networks used on the host.
479-
// The value cannot be changed after installation.
479+
// The value can be changed after installation.
480480
// When ommitted, this means no opinion and the platform is left to choose a reasonable
481481
// default which is subject to change over time.
482482
// The current default subnet is 100.88.0.0/16
@@ -491,8 +491,8 @@ type IPv4OVNKubernetesConfig struct {
491491
// internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the
492492
// default one is being already used by something else. It must not overlap with
493493
// any other subnet being used by OpenShift or by the node network. The size of the
494-
// subnet must be larger than the number of nodes. The value cannot be changed
495-
// after installation.
494+
// subnet must be larger than the number of nodes.
495+
// The value can be changed after installation.
496496
// The current default value is 100.64.0.0/16
497497
// The subnet must be large enough to accomadate one IP per node in your cluster
498498
// The value must be in proper IPV4 CIDR format
@@ -510,7 +510,7 @@ type IPv6OVNKubernetesConfig struct {
510510
// architecture that connects the cluster routers on each node together to enable
511511
// east west traffic. The subnet chosen should not overlap with other networks
512512
// specified for OVN-Kubernetes as well as other networks used on the host.
513-
// The value cannot be changed after installation.
513+
// The value can be changed after installation.
514514
// When ommitted, this means no opinion and the platform is left to choose a reasonable
515515
// default which is subject to change over time.
516516
// The subnet must be large enough to accomadate one IP per node in your cluster
@@ -525,8 +525,8 @@ type IPv6OVNKubernetesConfig struct {
525525
// internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the
526526
// default one is being already used by something else. It must not overlap with
527527
// any other subnet being used by OpenShift or by the node network. The size of the
528-
// subnet must be larger than the number of nodes. The value cannot be changed
529-
// after installation.
528+
// subnet must be larger than the number of nodes.
529+
// The value can be changed after installation.
530530
// The subnet must be large enough to accomadate one IP per node in your cluster
531531
// The current default value is fd98::/48
532532
// The value must be in proper IPV6 CIDR format

0 commit comments

Comments
 (0)