Skip to content

v1.18 Backports 2026-03-02#44592

Merged
joestringer merged 2 commits intov1.18from
pr/v1.18-backport-2026-03-02-11-13
Mar 3, 2026
Merged

v1.18 Backports 2026-03-02#44592
joestringer merged 2 commits intov1.18from
pr/v1.18-backport-2026-03-02-11-13

Conversation

@nebril
Copy link
Copy Markdown
Member

@nebril nebril commented Mar 2, 2026

Once this PR is merged, a GitHub action will update the labels of these PRs:

 44512 44540

0xch4z and others added 2 commits March 2, 2026 11:13
[ upstream commit 7bfbdd5 ]

Explicitly sets mode 0660 on admin.sock for both embedded and standalone
envoy. Without this the socket is created world-accessible.

Signed-off-by: Charlie Kenney <charles.kenney@isovalent.com>
Signed-off-by: Maciej Kwiek <mkwiek@cisco.com>
[ upstream commit 0b3754e ]

The logic in (*nodeNeighborHandler).NodeUpdate and
(*nodeNeighborHandler).NodeDelete treats the node IPv4 address
retrieved using node.GetNodeIP(false) (where false means ipv6=false) as
an IPv6 address. This will lead to the address not correctly compared
and propagated to the forwardableIPManager.

Correct this by retrieving the node IPv6 address consistently for the
IPv6 paths.

Also rename an incorrectly named local variable in
(*nodeNeighborHandler).NodeAdd while at it.

Fixes: ccb7bd1 ("pkg/node/neighbordiscovery: Add node handler for neighbor discovery")
Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Maciej Kwiek <mkwiek@cisco.com>
@nebril nebril added kind/backports This PR provides functionality previously merged into master. backport/1.18 This PR represents a backport for Cilium 1.18.x of a PR that was merged to main. labels Mar 2, 2026
@nebril nebril requested a review from tklauser March 2, 2026 10:14
@nebril
Copy link
Copy Markdown
Member Author

nebril commented Mar 2, 2026

/test

@nebril nebril marked this pull request as ready for review March 2, 2026 10:15
@nebril nebril requested a review from a team as a code owner March 2, 2026 10:15
Copy link
Copy Markdown
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My change looks good, thanks Maciej!

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 3, 2026
@joestringer joestringer added this pull request to the merge queue Mar 3, 2026
Merged via the queue into v1.18 with commit 6c2076f Mar 3, 2026
304 of 306 checks passed
@joestringer joestringer deleted the pr/v1.18-backport-2026-03-02-11-13 branch March 3, 2026 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.18 This PR represents a backport for Cilium 1.18.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants