Skip to content

Prepare v1.18 stable branch #40240

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

Jump to bottom
Merged
merged 1 commit into from
Jul 1, 2025
Merged

Prepare v1.18 stable branch #40240

merged 1 commit into from
Jul 1, 2025

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Jun 27, 2025 •
edited by aanm
Loading

Includes: #40253
Related: cilium/release#330
Related: #36627

Tasks:

@joestringer joestringer added the release-note/misc This PR makes changes that have no direct user impact. label Jun 27, 2025
@github-actions github-actions bot added the cilium-cli This PR contains changes related with cilium-cli label Jun 27, 2025
@joestringer joestringer force-pushed the pr/joe/v1.18-branch branch 3 times, most recently from ef1b755 to e9d36b4 Compare June 27, 2025 01:12
@joestringer
Copy link
Member Author

joestringer commented Jun 27, 2025 •
edited
Loading

I'm not sure why the cilium-cli image build is failing. It seems to detect the presence of the cilium-cli directory in order to not skip the build action, but the directory is in fact not present, meaning that the build fails due to the lack of cilium-cli/Dockerfile. The equivalent logic seems to work fine on v1.17 branch, but somehow with this PR being based against main it must be working differently.

EDIT: Ah, due to a library reuse inside cilium-cli/utils the directory is still present. I'll work on a fix.

@joestringer joestringer force-pushed the pr/joe/v1.18-branch branch 3 times, most recently from d7fd40a to 2f37383 Compare June 27, 2025 18:47
@joestringer joestringer changed the base branch from main to v1.18 June 27, 2025 18:48
@joestringer joestringer mentioned this pull request Jun 27, 2025
Closed
56 tasks
@joestringer joestringer force-pushed the pr/joe/v1.18-branch branch 4 times, most recently from 82068d8 to 06428b3 Compare June 27, 2025 19:51
@joestringer joestringer mentioned this pull request Jun 27, 2025
Merged
2 tasks
joestringer
joestringer commented Jun 27, 2025
View reviewed changes
@joestringer joestringer reopened this Jun 27, 2025
@joestringer joestringer marked this pull request as ready for review June 27, 2025 21:47
@joestringer joestringer requested review from a team as code owners June 27, 2025 21:47
qmonnet
qmonnet approved these changes Jun 28, 2025
View reviewed changes
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Looks good for files owned by docs-structure 👍 Thanks!

aanm
aanm approved these changes Jun 30, 2025
View reviewed changes
@tklauser tklauser mentioned this pull request Jul 1, 2025
Closed
2 tasks
@aanm aanm force-pushed the pr/joe/v1.18-branch branch from 06428b3 to 9f5cf73 Compare July 1, 2025 15:00
@aanm aanm requested review from a team as code owners July 1, 2025 15:00
@aanm aanm requested review from rgo3, pippolo84 and tklauser July 1, 2025 15:00
@aanm aanm removed the dont-merge/blocked Another PR must be merged before this one. label Jul 1, 2025
@aanm aanm force-pushed the pr/joe/v1.18-branch branch from 9f5cf73 to b303a27 Compare July 1, 2025 15:01
@joestringer @aanm
Prepare v1.18 stable branch
c2f2a73 
Signed-off-by: Joe Stringer <joe@cilium.io>
@aanm aanm force-pushed the pr/joe/v1.18-branch branch from b303a27 to c2f2a73 Compare July 1, 2025 15:04
@aanm aanm enabled auto-merge July 1, 2025 15:06
@aanm aanm disabled auto-merge July 1, 2025 15:06
@aanm aanm enabled auto-merge July 1, 2025 15:08
@aanm aanm disabled auto-merge July 1, 2025 15:09
@aanm aanm merged commit b42d82b into v1.18 Jul 1, 2025
49 of 50 checks passed
@aanm aanm deleted the pr/joe/v1.18-branch branch July 1, 2025 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squeed squeed squeed approved these changes

@rolinh rolinh rolinh approved these changes

@marseel marseel marseel approved these changes

@ysksuzuki ysksuzuki ysksuzuki approved these changes

@aanm aanm aanm approved these changes

@tommyp1ckles tommyp1ckles tommyp1ckles approved these changes

@Artyop Artyop Artyop approved these changes

@HadrienPatte HadrienPatte HadrienPatte approved these changes

@qmonnet qmonnet qmonnet approved these changes

@smagnani96 smagnani96 smagnani96 approved these changes

@aditighag aditighag Awaiting requested review from aditighag aditighag was automatically assigned from cilium/contributing

@tamilmani1989 tamilmani1989 Awaiting requested review from tamilmani1989 tamilmani1989 was automatically assigned from cilium/azure

@jrajahalme jrajahalme Awaiting requested review from jrajahalme jrajahalme was automatically assigned from cilium/proxy

@harsimran-pabla harsimran-pabla Awaiting requested review from harsimran-pabla harsimran-pabla was automatically assigned from cilium/sig-bgp

@liyihuang liyihuang Awaiting requested review from liyihuang liyihuang was automatically assigned from cilium/aws

@rgo3 rgo3 Awaiting requested review from rgo3 rgo3 was automatically assigned from cilium/wireguard

@pippolo84 pippolo84 Awaiting requested review from pippolo84 pippolo84 was automatically assigned from cilium/sig-foundations

@tklauser tklauser Awaiting requested review from tklauser tklauser was automatically assigned from cilium/operator

Assignees
No one assigned
Labels
cilium-cli This PR contains changes related with cilium-cli release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.