Skip to content

Commit ae2f609

Browse files
committed
Modify api description for join and transit 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 9052dea commit ae2f609

12 files changed

+54
-108
lines changed

openapi/generated_openapi/zz_generated.openapi.go

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

openapi/openapi.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29277,11 +29277,11 @@
2927729277
"type": "object",
2927829278
"properties": {
2927929279
"internalJoinSubnet": {
29280-
"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",
29280+
"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",
2928129281
"type": "string"
2928229282
},
2928329283
"internalTransitSwitchSubnet": {
29284-
"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",
29284+
"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",
2928529285
"type": "string"
2928629286
}
2928729287
}
@@ -29300,11 +29300,11 @@
2930029300
"type": "object",
2930129301
"properties": {
2930229302
"internalJoinSubnet": {
29303-
"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",
29303+
"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",
2930429304
"type": "string"
2930529305
},
2930629306
"internalTransitSwitchSubnet": {
29307-
"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",
29307+
"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",
2930829308
"type": "string"
2930929309
}
2931029310
}
@@ -32003,11 +32003,11 @@
3200332003
"type": "string"
3200432004
},
3200532005
"v4InternalSubnet": {
32006-
"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",
32006+
"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. Default is 100.64.0.0/16",
3200732007
"type": "string"
3200832008
},
3200932009
"v6InternalSubnet": {
32010-
"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::/64",
32010+
"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. Default is fd98::/64",
3201132011
"type": "string"
3201232012
}
3201332013
}

operator/v1/types_network.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -431,16 +431,14 @@ type OVNKubernetesConfig struct {
431431
// v4InternalSubnet is a v4 subnet used internally by ovn-kubernetes in case the
432432
// default one is being already used by something else. It must not overlap with
433433
// any other subnet being used by OpenShift or by the node network. The size of the
434-
// subnet must be larger than the number of nodes. The value cannot be changed
435-
// after installation.
434+
// subnet must be larger than the number of nodes.
436435
// Default is 100.64.0.0/16
437436
// +optional
438437
V4InternalSubnet string `json:"v4InternalSubnet,omitempty"`
439438
// v6InternalSubnet is a v6 subnet used internally by ovn-kubernetes in case the
440439
// default one is being already used by something else. It must not overlap with
441440
// any other subnet being used by OpenShift or by the node network. The size of the
442-
// subnet must be larger than the number of nodes. The value cannot be changed
443-
// after installation.
441+
// subnet must be larger than the number of nodes.
444442
// Default is fd98::/64
445443
// +optional
446444
V6InternalSubnet string `json:"v6InternalSubnet,omitempty"`
@@ -478,7 +476,6 @@ type IPv4OVNKubernetesConfig struct {
478476
// architecture that connects the cluster routers on each node together to enable
479477
// east west traffic. The subnet chosen should not overlap with other networks
480478
// specified for OVN-Kubernetes as well as other networks used on the host.
481-
// The value cannot be changed after installation.
482479
// When ommitted, this means no opinion and the platform is left to choose a reasonable
483480
// default which is subject to change over time.
484481
// The current default subnet is 100.88.0.0/16
@@ -493,8 +490,7 @@ type IPv4OVNKubernetesConfig struct {
493490
// internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the
494491
// default one is being already used by something else. It must not overlap with
495492
// 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.
493+
// subnet must be larger than the number of nodes.
498494
// The current default value is 100.64.0.0/16
499495
// The subnet must be large enough to accomadate one IP per node in your cluster
500496
// The value must be in proper IPV4 CIDR format
@@ -512,7 +508,6 @@ type IPv6OVNKubernetesConfig struct {
512508
// architecture that connects the cluster routers on each node together to enable
513509
// east west traffic. The subnet chosen should not overlap with other networks
514510
// specified for OVN-Kubernetes as well as other networks used on the host.
515-
// The value cannot be changed after installation.
516511
// When ommitted, this means no opinion and the platform is left to choose a reasonable
517512
// default which is subject to change over time.
518513
// The subnet must be large enough to accomadate one IP per node in your cluster
@@ -527,8 +522,7 @@ type IPv6OVNKubernetesConfig struct {
527522
// internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the
528523
// default one is being already used by something else. It must not overlap with
529524
// 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.
525+
// subnet must be larger than the number of nodes.
532526
// The subnet must be large enough to accomadate one IP per node in your cluster
533527
// The current default value is fd98::/64
534528
// The value must be in proper IPV6 CIDR format

0 commit comments

Comments
 (0)