Skip to content
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

Always update github.com/cilium/cilium from main #2951

Merged
merged 1 commit into from
Feb 26, 2025

Conversation

tklauser
Copy link
Member

Currently, renovate will try to update to the latest patch release, i.e. 1.17.1 at the moment but the stable branches on github.com/cilium/cilium don't contain the cilium-cli/ directory, thus breaking the build on update PRs, see e.g. #2948

Instead, we should always be vendoring the latest version from main. Drop the renovate configuration accordingly and instead update the github.com/cilium/cilium dependency upon release of a new cilium-cli version.

Currently, renovate will try to update to the latest patch release, i.e.
1.17.1 at the moment but the stable branches on github.com/cilium/cilium
don't contain the cilium-cli/ directory, thus breaking the build on
update PRs, see e.g. #2948

Instead, we should always be vendoring the latest version from main.
Drop the renovate configuration accordingly and instead update the
github.com/cilium/cilium dependency upon release of a new cilium-cli
version.

Signed-off-by: Tobias Klauser <[email protected]>
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 sensible

@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 Feb 25, 2025
@tklauser tklauser merged commit 58d2cf5 into main Feb 26, 2025
13 checks passed
@tklauser tklauser deleted the pr/tklauser/cilium-updates branch February 26, 2025 09:32
tklauser added a commit that referenced this pull request Feb 26, 2025
The only direct dependency in go.mod is github.com/cilium/cilium which
is updated manually before release (see
#2951).

The Go version in go.mod is already excluded from being updated by
renovate and because there are no other modules to update anymore we can
omit go.mod from being updated by renovate altogether.

Also remove some leftover configuration that no longer applies as a
result of the merge of cilium-cli into github.com/cilium/cilium.

Signed-off-by: Tobias Klauser <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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