Skip to content

v1.18 Backports 2026-02-24#44519

Merged
YutaroHayakawa merged 4 commits intov1.18from
pr/v1.18-backport-2026-02-24-04-41
Mar 3, 2026
Merged

v1.18 Backports 2026-02-24#44519
YutaroHayakawa merged 4 commits intov1.18from
pr/v1.18-backport-2026-02-24-04-41

Conversation

@YutaroHayakawa
Copy link
Copy Markdown
Member

@YutaroHayakawa YutaroHayakawa commented Feb 25, 2026

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

 44381 44323 44443 44462 44492

@YutaroHayakawa YutaroHayakawa 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 Feb 25, 2026
@YutaroHayakawa YutaroHayakawa force-pushed the pr/v1.18-backport-2026-02-24-04-41 branch from 79496fa to 8650fd5 Compare February 26, 2026 23:47
@YutaroHayakawa YutaroHayakawa marked this pull request as ready for review February 26, 2026 23:48
@YutaroHayakawa YutaroHayakawa requested review from a team as code owners February 26, 2026 23:48
@YutaroHayakawa
Copy link
Copy Markdown
Member Author

/test

Copy link
Copy Markdown
Member

@julianwiedmann julianwiedmann left a comment

Choose a reason for hiding this comment

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

Thank you!

@YutaroHayakawa YutaroHayakawa force-pushed the pr/v1.18-backport-2026-02-24-04-41 branch from 8650fd5 to e8989ad Compare February 27, 2026 22:54
@YutaroHayakawa
Copy link
Copy Markdown
Member Author

/test

@maintainer-s-little-helper
Copy link
Copy Markdown

Commit d123ec6 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Feb 28, 2026
@YutaroHayakawa
Copy link
Copy Markdown
Member Author

/ci-e2e-upgrade

@YutaroHayakawa
Copy link
Copy Markdown
Member Author

/test

julianwiedmann and others added 2 commits March 2, 2026 15:29
[ upstream commit c0d2d72 ]

[ backporter's note: Remove the matrix generation code that doesn't
exist in this branch ]

Some e2e configs specify a different encryption algorithm (cbc-aes-sha256).
Have the e2e-upgrade workflow respect this.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
[ upstream commit 038d3ee ]

The newly introduced loadbalancer healthserver script
test that tests the health for services with proxy redirection
sometimes fails with the following error.

```
    scripttest.go:72: (command "* cmp healthserver-proxy.expected healthserver.after" failed, retrying in 500ms...)
        diff healthserver-proxy.expected healthserver.after
        --- healthserver-proxy.expected
        +++ healthserver.after
         Content-Type=application/json
         Date=<omitted>
         X-Content-Type-Options=nosniff
        -X-Load-Balancing-Endpoint-Weight=1
        +X-Load-Balancing-Endpoint-Weight=3
         ---
        -{"service":{"namespace":"test","name":"echo"},"localEndpoints":1}
        +{"service":{"namespace":"test","name":"echo"},"localEndpoints":3}
```

See https://github.com/cilium/cilium/actions/runs/21952595101/job/63407305531

Also reproduced locally when executing the test in a loop.

It seems that asynchronous (k8s) event processing can lead
to situations where the proxy redirection port (set with
`svc/set-proxy-redirect` test helper) is reset.
Even the retry to fetch and compare will always see the same
outdated data.

Therefore it seems to be safer to include the call to
`svc/set-proxy-redirect test/echo 1000` into the same
hive script test section so that it gets retried too
in case of a failure (`* `) prefix.

See https://docs.cilium.io/en/stable/contributing/development/hive/#command-reference
for more info.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
[ upstream commit d259c76 ]

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@smagnani96 smagnani96 force-pushed the pr/v1.18-backport-2026-02-24-04-41 branch from d123ec6 to d3ae6b9 Compare March 2, 2026 14:30
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Mar 2, 2026
@smagnani96
Copy link
Copy Markdown
Contributor

/test

[ upstream commit 167899c ]

[ backporter's note: The signature of toHTTPRoutes and toGRPCRoutes are
  different from the upstream. Adjust it. Also, the list of the test
  cases are diverged from the upstream. Take this branch's list and
  add "cert manager gateway" case. ]

This commit fixes a bug that prevented cert-manager from working
correctly in the Gateway API reconciler.

When checking hostnames to see if they were isolated from other
Listeners on the same Gateway, Cilium did not distinguish between
Listeners of different Protocols.

This meant that when a HTTP and HTTPS listener had the same
or overlapping hostnames, then the HTTP config would not be
generated.

The fix was to keep track of the hostnames by Protocol, and
only check the ones of the _same_ protocol, which was the
correct behavior the whole time.

This adds a new test to the model ingestion to catch this
specific case as well.

Updates #36750
Updates #44123

Signed-off-by: Nick Young <nick@isovalent.com>
@YutaroHayakawa YutaroHayakawa force-pushed the pr/v1.18-backport-2026-02-24-04-41 branch from d3ae6b9 to d3f666b Compare March 2, 2026 19:19
@YutaroHayakawa
Copy link
Copy Markdown
Member Author

/test

@YutaroHayakawa
Copy link
Copy Markdown
Member Author

@YutaroHayakawa YutaroHayakawa enabled auto-merge March 3, 2026 00:18
@YutaroHayakawa YutaroHayakawa added this pull request to the merge queue Mar 3, 2026
Merged via the queue into v1.18 with commit 71f4cf4 Mar 3, 2026
302 of 304 checks passed
@YutaroHayakawa YutaroHayakawa deleted the pr/v1.18-backport-2026-02-24-04-41 branch March 3, 2026 01:15
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants