Skip to content

v1.19 Backports 2026-03-04#44628

Merged
joestringer merged 2 commits intov1.19from
pr/v1.19-backport-2026-03-04-11-02
Mar 5, 2026
Merged

v1.19 Backports 2026-03-04#44628
joestringer merged 2 commits intov1.19from
pr/v1.19-backport-2026-03-04-11-02

Conversation

@YutaroHayakawa
Copy link
Copy Markdown
Member

[ upstream commit 6c968d1 ]

- Don't hard-code input files. Make them injectable via variable.
- Matching patterns for required_files doesn't include bpf/*.h. Since
  nothing prevents us from having header file at the bpf top directory,
  we should include them.

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
[ upstream commit b9ba532 ]

This is a follow-up for the 6c968d1. Instead of injecting the source
information files manually, automatically find source files by matching
the magic marker "@@ source files list begin". This makes it easier to
run the script stand-alone and also makes it resillient against file
name changes.

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@YutaroHayakawa YutaroHayakawa added kind/backports This PR provides functionality previously merged into master. backport/1.19 This PR represents a backport for Cilium 1.19.x of a PR that was merged to main. labels Mar 4, 2026
@YutaroHayakawa
Copy link
Copy Markdown
Member Author

/test

@YutaroHayakawa YutaroHayakawa marked this pull request as ready for review March 4, 2026 19:32
@YutaroHayakawa YutaroHayakawa requested a review from a team as a code owner March 4, 2026 19:32
@joestringer joestringer enabled auto-merge March 4, 2026 19:43
@YutaroHayakawa
Copy link
Copy Markdown
Member Author

@YutaroHayakawa
Copy link
Copy Markdown
Member Author

Conformance L7-only (ci-l7): Hitting this #44631 but with different matrix.

@joestringer joestringer added this pull request to the merge queue Mar 5, 2026
Merged via the queue into v1.19 with commit f2a03bc Mar 5, 2026
574 of 580 checks passed
@joestringer joestringer deleted the pr/v1.19-backport-2026-03-04-11-02 branch March 5, 2026 01:40
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Mar 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.19 This PR represents a backport for Cilium 1.19.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.

3 participants