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.

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

images: bump cni plugins to v1.5.0 #32629

Merged
merged 2 commits into from
May 22, 2024
Merged

images: bump cni plugins to v1.5.0 #32629

merged 2 commits into from
May 22, 2024

Conversation

antonipp
Copy link
Contributor

The cilium-runtime image can no longer be built on main because the CNI plugin binaries for v1.4.1 were updated in-place: containernetworking/plugins#1038

The SHAs on main are:

cilium/images/runtime/cni-version.sh

Lines 4 to 5 in db5fcdc

cni_sha512[amd64]="5cff10005288a78b484bbabbaa24669d62a6eedb6cc7c7604b2c1ea14b65e90a1b022c2a2975d7764ec41f24707f6349432e8f11564d03cea0da141195b0602e"
cni_sha512[arm64]="ff45befcbe4171536cd27723ce6c36a916ad55b682594c79f6c72a14252de5004c8f7e08662456fe36e1835da04a5ef818324e5a444f69f53e957aabc6f40194"

and the new SHAs upstream are now:

$ curl -L "https://github.com/containernetworking/plugins/releases/download/v1.4.1/cni-plugins-linux-amd64-v1.4.1.tgz.sha512"
3679530ee3379afda5f77213de072c298f3d6dc9a70085e7175303b238ab481bc1438cc3bb784d304e85fe34b2dacc418b705fba48be38bd77c23717f0e7a9c0  cni-plugins-linux-amd64-v1.4.1.tgz

$ curl -L "https://github.com/containernetworking/plugins/releases/download/v1.4.1/cni-plugins-linux-arm64-v1.4.1.tgz.sha512"
c96b3cbdee78ef002bdb6eeee23cfd0b5212afae9f983f23330c294eae28551b4227bb6153d53b360415d08e61b1a23c3fdf34a617f2a9439bf520367f55181b  cni-plugins-linux-arm64-v1.4.1.tgz

I suggest that we no longer use 1.4.1 and we move towards 1.5.0 which was released properly yesterday. The changelog is very minimal so the bump should be relatively safe: https://github.com/containernetworking/plugins/releases/tag/v1.5.0

bump cni plugins to v1.5.0

@antonipp
images: bump cni plugins to v1.5.0
077c253 
The result of running

```
images/scripts/update-cni-version.sh 1.5.0
```

Signed-off-by: Anton Ippolitov <anton.ippolitov@datadoghq.com>
@antonipp antonipp requested a review from a team as a code owner May 21, 2024 08:44
@antonipp antonipp requested a review from borkmann May 21, 2024 08:44
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 21, 2024
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label May 21, 2024
@antonipp
Copy link
Contributor Author

antonipp commented May 21, 2024 •
edited
Loading

I think I also need to update the actual images like it was done here: #31347
But I am not sure what's the exact release process for this.

Edit: nvm, found the docs here https://docs.cilium.io/en/latest/contributing/development/images/#update-cilium-builder-and-cilium-runtime-images

@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label May 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 21, 2024
@tklauser tklauser added needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels May 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.15.6 May 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.17 May 21, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.12 May 21, 2024
@tklauser
Copy link
Member

@antonipp it looks like the second commit images: update cilium-{runtime,builder} is empty. Could you please re-run make -C image update-runtime-image update-builder-image and amend the result?

@antonipp antonipp force-pushed the ai/update-cni-version-1.5.0 branch from 291b77d to 10cf348 Compare May 21, 2024 14:55
@antonipp antonipp requested review from a team as code owners May 21, 2024 14:55
@antonipp antonipp temporarily deployed to release-base-images May 21, 2024 14:55 — with GitHub Actions Inactive
@antonipp
Copy link
Contributor Author

Yes, sorry, just fixed it!

@tklauser
Copy link
Member

/test

tklauser
tklauser approved these changes May 21, 2024
View reviewed changes
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Thanks @antonipp!

@tklauser tklauser removed the request for review from borkmann May 21, 2024 15:14
@tklauser tklauser enabled auto-merge May 21, 2024 15:14
@tklauser
Copy link
Member

@antonipp it looks like there's still something off with the image hashes and .devcontainer/devcontainer.json needs an update too: https://github.com/cilium/cilium/actions/runs/9176783977/job/25232879571?pr=32629

@antonipp
images: update cilium-{runtime,builder}
48c5563 
Signed-off-by: Anton Ippolitov <anton.ippolitov@datadoghq.com>
auto-merge was automatically disabled May 22, 2024 09:00

Head branch was pushed to by a user without write access

@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 May 22, 2024
Merged via the queue into cilium:main with commit 62117e7 May 22, 2024
65 checks passed
@lmb lmb mentioned this pull request May 22, 2024
Closed
@YutaroHayakawa YutaroHayakawa mentioned this pull request May 23, 2024
Merged
15 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels May 23, 2024
@YutaroHayakawa YutaroHayakawa mentioned this pull request May 24, 2024
Merged
12 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels May 24, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.15 in 1.15.6 May 24, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.12 May 24, 2024
@YutaroHayakawa YutaroHayakawa mentioned this pull request May 24, 2024
Merged
10 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels May 24, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.17 May 24, 2024
@github-actions github-actions bot added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels May 25, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.15 in 1.15.6 May 25, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels May 27, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport done to v1.15 in 1.15.6 May 27, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.14 in 1.14.12 May 27, 2024
@github-actions github-actions bot added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels May 28, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport done to v1.14 in 1.14.12 May 28, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.13 in 1.13.17 May 28, 2024
This was referenced Jun 8, 2024
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

@bimmlerd bimmlerd bimmlerd approved these changes

@viktor-kurchenko viktor-kurchenko viktor-kurchenko approved these changes

Assignees
No one assigned
Labels
backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
1.14.12
Backport done to v1.14
1.15.6
Backport done to v1.15
cilium v1.13.17
Status: Released
cilium v1.14.12
Status: Released
cilium v1.15.6
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@antonipp @tklauser @bimmlerd @viktor-kurchenko @YutaroHayakawa