Skip to content

Cilium CLI fix for AWS ENI mode #36887

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.

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

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Cilium CLI fix for AWS ENI mode #36887

merged 1 commit into from
Jan 8, 2025

Conversation

viktor-kurchenko
Copy link
Contributor

Use both eth+ and ens+ interfaces only with newer CLI versions due to a bug in iptables provisioning for the older Cilium versions.

Use both `eth+` and `ens+` interfaces only with newer CLI versions due
to a bug in iptables provisioning for the older Cilium versions.

Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 8, 2025
@github-actions github-actions bot added cilium-cli This PR contains changes related with cilium-cli cilium-cli-exclusive This PR only impacts cilium-cli binary labels Jan 8, 2025
@viktor-kurchenko viktor-kurchenko added release-note/bug This PR fixes an issue in a previous release of Cilium. and removed cilium-cli This PR contains changes related with cilium-cli cilium-cli-exclusive This PR only impacts cilium-cli binary labels Jan 8, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 8, 2025
@viktor-kurchenko viktor-kurchenko added area/cli Impacts the command line interface of any command in the repository. cilium-cli This PR contains changes related with cilium-cli labels Jan 8, 2025
@viktor-kurchenko viktor-kurchenko marked this pull request as ready for review January 8, 2025 13:57
@viktor-kurchenko viktor-kurchenko requested review from a team as code owners January 8, 2025 13:57
@aanm aanm enabled auto-merge January 8, 2025 14:00
@aanm
Copy link
Member

aanm commented Jan 8, 2025

/test

@aanm aanm added this pull request to the merge queue Jan 8, 2025
Merged via the queue into main with commit 47bb433 Jan 8, 2025
225 of 226 checks passed
@aanm aanm deleted the vk/pr/cli/aws/eni/fix branch January 8, 2025 15:49
michi-covalent added a commit that referenced this pull request Jan 28, 2025
Ref: #36887

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
michi-covalent added a commit that referenced this pull request Jan 28, 2025
Ref: #36887

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
michi-covalent added a commit that referenced this pull request Jan 28, 2025
The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
github-merge-queue bot pushed a commit that referenced this pull request Jan 29, 2025
The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
joestringer pushed a commit that referenced this pull request Jan 29, 2025
The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@julianwiedmann julianwiedmann added the cilium-cli-exclusive This PR only impacts cilium-cli binary label May 9, 2025
jrajahalme pushed a commit that referenced this pull request Jul 10, 2025
[ upstream commit 72369a6 ]

The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
jrajahalme pushed a commit that referenced this pull request Jul 12, 2025
[ upstream commit 72369a6 ]

The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
github-merge-queue bot pushed a commit that referenced this pull request Jul 14, 2025
[ upstream commit 72369a6 ]

The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
github-merge-queue bot pushed a commit that referenced this pull request Jul 14, 2025
[ upstream commit 72369a6 ]

The egressMasqueradeInterfaces Helm value incorrectly gets set to "eth+"
instead of "eth+ ens+" because of the version check ">=1.17.0" added in
#36887. versioncheck.Version does
not ignore alpha/beta/rc/snapshot pre-release versions [^1]. Explicitly
set egressMasqueradeInterfaces to 'eth+ ens+' as a workaround.

[^1]: https://github.com/cilium/cilium/blob/2a349d5c5353cf0235414579885122425025dbdb/pkg/versioncheck/check.go#L44-L71

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli Impacts the command line interface of any command in the repository. cilium-cli This PR contains changes related with cilium-cli cilium-cli-exclusive This PR only impacts cilium-cli binary release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants