Skip to content

Commit 6e35e96

Browse files
committed
Modify api description for masquerade subnet
Default masquerade subnet has been changed recently and modifying api description to reflect recent changes. Signed-off-by: Arnab Ghosh <[email protected]>
1 parent ae2f609 commit 6e35e96

12 files changed

+24
-24
lines changed

openapi/generated_openapi/zz_generated.openapi.go

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

openapi/openapi.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29268,7 +29268,7 @@
2926829268
"type": "object",
2926929269
"properties": {
2927029270
"internalMasqueradeSubnet": {
29271-
"description": "internalMasqueradeSubnet contains the masquerade addresses in IPV4 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /29). When omitted, 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 169.254.169.0/29 The value must be in proper IPV4 CIDR format",
29271+
"description": "internalMasqueradeSubnet contains the masquerade addresses in IPV4 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /29). When omitted, 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 169.254.0.0/17 The value must be in proper IPV4 CIDR format",
2927229272
"type": "string"
2927329273
}
2927429274
}
@@ -29291,7 +29291,7 @@
2929129291
"type": "object",
2929229292
"properties": {
2929329293
"internalMasqueradeSubnet": {
29294-
"description": "internalMasqueradeSubnet contains the masquerade addresses in IPV6 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /125). When omitted, 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 fd69::/125 Note that IPV6 dual addresses are not permitted",
29294+
"description": "internalMasqueradeSubnet contains the masquerade addresses in IPV6 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /125). When omitted, 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 fd69::/112 Note that IPV6 dual addresses are not permitted",
2929529295
"type": "string"
2929629296
}
2929729297
}

operator/v1/types_network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ type IPv4GatewayConfig struct {
640640
// OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
641641
// be large enough to accommodate 6 IPs (maximum prefix length /29).
642642
// When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
643-
// The current default subnet is 169.254.169.0/29
643+
// The current default subnet is 169.254.0.0/17
644644
// The value must be in proper IPV4 CIDR format
645645
// +kubebuilder:validation:MaxLength=18
646646
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 4",message="Subnet must be in valid IPV4 CIDR format"
@@ -659,7 +659,7 @@ type IPv6GatewayConfig struct {
659659
// OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
660660
// be large enough to accommodate 6 IPs (maximum prefix length /125).
661661
// When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
662-
// The current default subnet is fd69::/125
662+
// The current default subnet is fd69::/112
663663
// Note that IPV6 dual addresses are not permitted
664664
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 6",message="Subnet must be in valid IPV6 CIDR format"
665665
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 125",message="subnet must be in the range /0 to /125 inclusive"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ spec:
317317
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
318318
be large enough to accommodate 6 IPs (maximum prefix length /29).
319319
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
320-
The current default subnet is 169.254.169.0/29
320+
The current default subnet is 169.254.0.0/17
321321
The value must be in proper IPV4 CIDR format
322322
maxLength: 18
323323
type: string
@@ -346,7 +346,7 @@ spec:
346346
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
347347
be large enough to accommodate 6 IPs (maximum prefix length /125).
348348
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
349-
The current default subnet is fd69::/125
349+
The current default subnet is fd69::/112
350350
Note that IPV6 dual addresses are not permitted
351351
type: string
352352
x-kubernetes-validations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ spec:
317317
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
318318
be large enough to accommodate 6 IPs (maximum prefix length /29).
319319
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
320-
The current default subnet is 169.254.169.0/29
320+
The current default subnet is 169.254.0.0/17
321321
The value must be in proper IPV4 CIDR format
322322
maxLength: 18
323323
type: string
@@ -346,7 +346,7 @@ spec:
346346
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
347347
be large enough to accommodate 6 IPs (maximum prefix length /125).
348348
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
349-
The current default subnet is fd69::/125
349+
The current default subnet is fd69::/112
350350
Note that IPV6 dual addresses are not permitted
351351
type: string
352352
x-kubernetes-validations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ spec:
317317
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
318318
be large enough to accommodate 6 IPs (maximum prefix length /29).
319319
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
320-
The current default subnet is 169.254.169.0/29
320+
The current default subnet is 169.254.0.0/17
321321
The value must be in proper IPV4 CIDR format
322322
maxLength: 18
323323
type: string
@@ -346,7 +346,7 @@ spec:
346346
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
347347
be large enough to accommodate 6 IPs (maximum prefix length /125).
348348
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
349-
The current default subnet is fd69::/125
349+
The current default subnet is fd69::/112
350350
Note that IPV6 dual addresses are not permitted
351351
type: string
352352
x-kubernetes-validations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ spec:
317317
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
318318
be large enough to accommodate 6 IPs (maximum prefix length /29).
319319
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
320-
The current default subnet is 169.254.169.0/29
320+
The current default subnet is 169.254.0.0/17
321321
The value must be in proper IPV4 CIDR format
322322
maxLength: 18
323323
type: string
@@ -346,7 +346,7 @@ spec:
346346
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
347347
be large enough to accommodate 6 IPs (maximum prefix length /125).
348348
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
349-
The current default subnet is fd69::/125
349+
The current default subnet is fd69::/112
350350
Note that IPV6 dual addresses are not permitted
351351
type: string
352352
x-kubernetes-validations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ spec:
284284
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
285285
be large enough to accommodate 6 IPs (maximum prefix length /29).
286286
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
287-
The current default subnet is 169.254.169.0/29
287+
The current default subnet is 169.254.0.0/17
288288
The value must be in proper IPV4 CIDR format
289289
maxLength: 18
290290
type: string
@@ -313,7 +313,7 @@ spec:
313313
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
314314
be large enough to accommodate 6 IPs (maximum prefix length /125).
315315
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
316-
The current default subnet is fd69::/125
316+
The current default subnet is fd69::/112
317317
Note that IPV6 dual addresses are not permitted
318318
type: string
319319
x-kubernetes-validations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ spec:
317317
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
318318
be large enough to accommodate 6 IPs (maximum prefix length /29).
319319
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
320-
The current default subnet is 169.254.169.0/29
320+
The current default subnet is 169.254.0.0/17
321321
The value must be in proper IPV4 CIDR format
322322
maxLength: 18
323323
type: string
@@ -346,7 +346,7 @@ spec:
346346
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
347347
be large enough to accommodate 6 IPs (maximum prefix length /125).
348348
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
349-
The current default subnet is fd69::/125
349+
The current default subnet is fd69::/112
350350
Note that IPV6 dual addresses are not permitted
351351
type: string
352352
x-kubernetes-validations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ spec:
284284
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
285285
be large enough to accommodate 6 IPs (maximum prefix length /29).
286286
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
287-
The current default subnet is 169.254.169.0/29
287+
The current default subnet is 169.254.0.0/17
288288
The value must be in proper IPV4 CIDR format
289289
maxLength: 18
290290
type: string
@@ -313,7 +313,7 @@ spec:
313313
OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must
314314
be large enough to accommodate 6 IPs (maximum prefix length /125).
315315
When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
316-
The current default subnet is fd69::/125
316+
The current default subnet is fd69::/112
317317
Note that IPV6 dual addresses are not permitted
318318
type: string
319319
x-kubernetes-validations:

0 commit comments

Comments
 (0)