Skip to content
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

Cilium masquerading #1653

Merged
merged 3 commits into from
Oct 9, 2023
Merged

Cilium masquerading #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24bece4
Disable masquerading when cilium is in ENI mode.
whites11 Oct 9, 2023
d507cba
Disable masquerading when cilium is in ENI mode.
whites11 Oct 9, 2023
944241e
Disable masquerading when cilium is in ENI mode.
whites11 Oct 9, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Disable masquerading when cilium is in ENI mode.

## [5.8.0-patch1] - 2023-09-26

### Added
Expand Down
5 changes: 1 addition & 4 deletions service/controller/resource/clusterconfigmap/desired.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@ func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) ([]*cor
"mode": "eni",
}

// there is autodiscoverability on the VPC CIDrs
ciliumValues["ipv4NativeRoutingCIDR"] = podCIDR

// https://docs.cilium.io/en/v1.13/network/concepts/routing/#id5
ciliumValues["endpointRoutes"] = map[string]interface{}{
"enabled": true,
Expand All @@ -247,7 +244,7 @@ func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) ([]*cor
},
}

ciliumValues["egressMasqueradeInterfaces"] = "eth+"
ciliumValues["enableIPv4Masquerade"] = false
ciliumValues["tunnel"] = "disabled"
// Used by cilium to tag ENIs it creates and be able to filter and clean them up.
ciliumValues["cluster"] = map[string]interface{}{
Expand Down