deps: bump cilium/cilium to v1.19.5 and cilium/ebpf to v0.22.0 - #2516
Closed
Quang Nguyen (nddq) wants to merge 1 commit into
Closed
deps: bump cilium/cilium to v1.19.5 and cilium/ebpf to v0.22.0#2516Quang Nguyen (nddq) wants to merge 1 commit into
Quang Nguyen (nddq) wants to merge 1 commit into
Conversation
Anchor the cilium constellation on cilium/cilium v1.19.5 (latest v1.19.x) and let its requirements set the satellites: statedb moves to v0.5.8, hive stays at the pseudo-version cilium pins, and the k8s.io modules ride along to v0.35.6 in patch lockstep. cilium/ebpf is bumped independently to v0.22.0. hive v1.0.4 and statedb v0.8.x must NOT be taken: cilium v1.19.5's own pkg/hive fails to compile against them (reconciler.Metrics grew a parameter, job.groupOpt changed), which is why the standalone dependabot bumps for those modules cannot merge. go build ./... clean; 41 test packages pass with no new failures relative to main. Signed-off-by: Quang Nguyen <nguyenquang@microsoft.com>
Retina Code Coverage ReportTotal coverage no changeIncreased diff
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Bumps the cilium dependency constellation, anchored on
cilium/ciliumand letting its requirements dictate the coupled satellites:github.com/cilium/ciliumv1.19.3v1.19.5github.com/cilium/ebpfv0.21.0v0.22.0github.com/cilium/statedbv0.5.6v0.5.8(cilium's requirement)github.com/cilium/hivek8s.io/*v0.35.3/.4v0.35.6(patch lockstep ride-along)The satellites deliberately do not go to their newest tags:
cilium/cilium v1.19.5's ownpkg/hivefails to compile againsthive v1.0.4/statedb v0.8.x:Supersedes #2493 (same
ebpfbump, here as part of the coherent set). #2490 (hive→v1.0.4-rc1) and #2454 (statedb→0.8.2) should be closed as incompatible with ciliumv1.19.xper the error above — those modules can only move whencilium/ciliumitself does.Related Issue
N/A.
Checklist
git commit -S -s ...).Screenshots (if applicable) or Testing Completed
go build ./...clean;go test ./pkg/... -count=1: 41 packages pass, no new failures relative tomain(the two locally-failing packages —pkg/controllers/daemon/retinaendpointneeding envtest assets andpkg/loaderneeding bpftool — fail identically on an untouchedmaincheckout).Additional Notes
hack/toolsand/sitemodules have no cilium dependencies; only the rootgo.mod/go.sumchange.ciliumdependabot group to minors (as deps: group k8s.io minor updates in dependabot config #2512 does fork8s): the satellites' latest tags are incompatible with pinnedcilium/ciliumby design, so grouped minor PRs would still be unbuildable — this constellation needs anchored manual bumps.HUBBLE_VERSIONCLI pin in the agent image (v1.19.3in the Makefile/Dockerfile) can be aligned tov1.19.5separately, per the precedent of deps: bump hubble CLI to v1.19.3 #2310.