Skip to content

Commit b8a067b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2199 from pperiyasamy/remove-never-ipsec-encap-option
OCPBUGS-48542: Remove Never option from IPsec Encapsulation
2 parents bf3f3e9 + 50507a7 commit b8a067b

12 files changed

+13
-32
lines changed

‎openapi/generated_openapi/zz_generated.openapi.go

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

‎openapi/openapi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28282,7 +28282,7 @@
2828228282
"type": "object",
2828328283
"properties": {
2828428284
"encapsulation": {
28285-
"description": "encapsulation option to configure libreswan on how inter-pod traffic across nodes are encapsulated to handle NAT traversal. When configured it uses UDP port 4500 for the encapsulation. Valid values are Always, Never, Auto and omitted. Always means enable UDP encapsulation regardless of whether NAT is detected. Disable means never enable UDP encapsulation even if NAT is present. Auto means enable UDP encapsulation based on the detection of NAT. 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 is Auto.",
28285+
"description": "encapsulation option to configure libreswan on how inter-pod traffic across nodes are encapsulated to handle NAT traversal. When configured it uses UDP port 4500 for the encapsulation. Valid values are Always, Auto and omitted. Always means enable UDP encapsulation regardless of whether NAT is detected. Auto means enable UDP encapsulation based on the detection of NAT. 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 is Auto.",
2828628286
"type": "string"
2828728287
}
2828828288
}

‎operator/v1/types_network.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,6 @@ type Encapsulation string
580580
const (
581581
// EncapsulationAlways always enable UDP encapsulation regardless of whether NAT is detected.
582582
EncapsulationAlways = "Always"
583-
// EncapsulationNever never enable UDP encapsulation even if NAT is present.
584-
EncapsulationNever = "Never"
585583
// EncapsulationAuto enable UDP encapsulation based on the detection of NAT.
586584
EncapsulationAuto = "Auto"
587585
)
@@ -592,13 +590,12 @@ type IPsecFullModeConfig struct {
592590
// encapsulation option to configure libreswan on how inter-pod traffic across nodes
593591
// are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
594592
// for the encapsulation.
595-
// Valid values are Always, Never, Auto and omitted.
593+
// Valid values are Always, Auto and omitted.
596594
// Always means enable UDP encapsulation regardless of whether NAT is detected.
597-
// Disable means never enable UDP encapsulation even if NAT is present.
598595
// Auto means enable UDP encapsulation based on the detection of NAT.
599596
// When omitted, this means no opinion and the platform is left to choose a reasonable
600597
// default, which is subject to change over time. The current default is Auto.
601-
// +kubebuilder:validation:Enum:=Always;Never;Auto
598+
// +kubebuilder:validation:Enum:=Always;Auto
602599
// +optional
603600
Encapsulation Encapsulation `json:"encapsulation,omitempty"`
604601
}

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,13 @@ spec:
424424
encapsulation option to configure libreswan on how inter-pod traffic across nodes
425425
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
426426
for the encapsulation.
427-
Valid values are Always, Never, Auto and omitted.
427+
Valid values are Always, Auto and omitted.
428428
Always means enable UDP encapsulation regardless of whether NAT is detected.
429-
Disable means never enable UDP encapsulation even if NAT is present.
430429
Auto means enable UDP encapsulation based on the detection of NAT.
431430
When omitted, this means no opinion and the platform is left to choose a reasonable
432431
default, which is subject to change over time. The current default is Auto.
433432
enum:
434433
- Always
435-
- Never
436434
- Auto
437435
type: string
438436
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,13 @@ spec:
424424
encapsulation option to configure libreswan on how inter-pod traffic across nodes
425425
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
426426
for the encapsulation.
427-
Valid values are Always, Never, Auto and omitted.
427+
Valid values are Always, Auto and omitted.
428428
Always means enable UDP encapsulation regardless of whether NAT is detected.
429-
Disable means never enable UDP encapsulation even if NAT is present.
430429
Auto means enable UDP encapsulation based on the detection of NAT.
431430
When omitted, this means no opinion and the platform is left to choose a reasonable
432431
default, which is subject to change over time. The current default is Auto.
433432
enum:
434433
- Always
435-
- Never
436434
- Auto
437435
type: string
438436
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,13 @@ spec:
424424
encapsulation option to configure libreswan on how inter-pod traffic across nodes
425425
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
426426
for the encapsulation.
427-
Valid values are Always, Never, Auto and omitted.
427+
Valid values are Always, Auto and omitted.
428428
Always means enable UDP encapsulation regardless of whether NAT is detected.
429-
Disable means never enable UDP encapsulation even if NAT is present.
430429
Auto means enable UDP encapsulation based on the detection of NAT.
431430
When omitted, this means no opinion and the platform is left to choose a reasonable
432431
default, which is subject to change over time. The current default is Auto.
433432
enum:
434433
- Always
435-
- Never
436434
- Auto
437435
type: string
438436
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,13 @@ spec:
424424
encapsulation option to configure libreswan on how inter-pod traffic across nodes
425425
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
426426
for the encapsulation.
427-
Valid values are Always, Never, Auto and omitted.
427+
Valid values are Always, Auto and omitted.
428428
Always means enable UDP encapsulation regardless of whether NAT is detected.
429-
Disable means never enable UDP encapsulation even if NAT is present.
430429
Auto means enable UDP encapsulation based on the detection of NAT.
431430
When omitted, this means no opinion and the platform is left to choose a reasonable
432431
default, which is subject to change over time. The current default is Auto.
433432
enum:
434433
- Always
435-
- Never
436434
- Auto
437435
type: string
438436
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,13 @@ spec:
391391
encapsulation option to configure libreswan on how inter-pod traffic across nodes
392392
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
393393
for the encapsulation.
394-
Valid values are Always, Never, Auto and omitted.
394+
Valid values are Always, Auto and omitted.
395395
Always means enable UDP encapsulation regardless of whether NAT is detected.
396-
Disable means never enable UDP encapsulation even if NAT is present.
397396
Auto means enable UDP encapsulation based on the detection of NAT.
398397
When omitted, this means no opinion and the platform is left to choose a reasonable
399398
default, which is subject to change over time. The current default is Auto.
400399
enum:
401400
- Always
402-
- Never
403401
- Auto
404402
type: string
405403
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,13 @@ spec:
424424
encapsulation option to configure libreswan on how inter-pod traffic across nodes
425425
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
426426
for the encapsulation.
427-
Valid values are Always, Never, Auto and omitted.
427+
Valid values are Always, Auto and omitted.
428428
Always means enable UDP encapsulation regardless of whether NAT is detected.
429-
Disable means never enable UDP encapsulation even if NAT is present.
430429
Auto means enable UDP encapsulation based on the detection of NAT.
431430
When omitted, this means no opinion and the platform is left to choose a reasonable
432431
default, which is subject to change over time. The current default is Auto.
433432
enum:
434433
- Always
435-
- Never
436434
- Auto
437435
type: string
438436
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,13 @@ spec:
391391
encapsulation option to configure libreswan on how inter-pod traffic across nodes
392392
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
393393
for the encapsulation.
394-
Valid values are Always, Never, Auto and omitted.
394+
Valid values are Always, Auto and omitted.
395395
Always means enable UDP encapsulation regardless of whether NAT is detected.
396-
Disable means never enable UDP encapsulation even if NAT is present.
397396
Auto means enable UDP encapsulation based on the detection of NAT.
398397
When omitted, this means no opinion and the platform is left to choose a reasonable
399398
default, which is subject to change over time. The current default is Auto.
400399
enum:
401400
- Always
402-
- Never
403401
- Auto
404402
type: string
405403
type: object

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,13 @@ spec:
391391
encapsulation option to configure libreswan on how inter-pod traffic across nodes
392392
are encapsulated to handle NAT traversal. When configured it uses UDP port 4500
393393
for the encapsulation.
394-
Valid values are Always, Never, Auto and omitted.
394+
Valid values are Always, Auto and omitted.
395395
Always means enable UDP encapsulation regardless of whether NAT is detected.
396-
Disable means never enable UDP encapsulation even if NAT is present.
397396
Auto means enable UDP encapsulation based on the detection of NAT.
398397
When omitted, this means no opinion and the platform is left to choose a reasonable
399398
default, which is subject to change over time. The current default is Auto.
400399
enum:
401400
- Always
402-
- Never
403401
- Auto
404402
type: string
405403
type: object

‎operator/v1/zz_generated.swagger_doc_generated.go

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

0 commit comments

Comments
 (0)