Skip to content

Bump CNI to 1.3 (and minor tooling versions) #4112

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 2 commits into from
Apr 18, 2025
Merged

Bump CNI to 1.3 (and minor tooling versions) #4112

merged 2 commits into from
Apr 18, 2025

Conversation

apostasie
Copy link
Contributor

@apostasie apostasie commented Apr 16, 2025 •
edited
Loading

Closes #4091

@apostasie apostasie changed the title Bump dependencies [WIP] Bump dependencies Apr 16, 2025
@apostasie apostasie force-pushed the bump-deps branch 2 times, most recently from 9216480 to f239e93 Compare April 16, 2025 05:45
@apostasie apostasie mentioned this pull request Apr 16, 2025
Closed
@apostasie apostasie force-pushed the bump-deps branch 3 times, most recently from 1366bf1 to 35920f1 Compare April 16, 2025 17:56
@apostasie
Copy link
Contributor Author

apostasie commented Apr 16, 2025 •
edited
Loading

Note: this involves following cni changes to their configuration format (non-conflist are no longer supported).
This might have an impact for people who use the old format.

@apostasie apostasie marked this pull request as ready for review April 16, 2025 18:32
@apostasie apostasie changed the title [WIP] Bump dependencies Bump CNI to 1.3 (and minor tooling versions) Apr 16, 2025
@AkihiroSuda AkihiroSuda added this to the v2.0.5 milestone Apr 17, 2025
AkihiroSuda
AkihiroSuda reviewed Apr 17, 2025
View reviewed changes
pkg/netutil/netutil.go
@@ -533,21 +532,9 @@ func cniLoad(fileNames []string) (configList []*NetworkConfig, err error) {
}

var netConfigList *libcni.NetworkConfigList
if strings.HasSuffix(fileName, ".conflist") {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should print a warning for a non-conflist file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah. I find it all confusing.
Non-list configurations were removed from the 1.0 spec anyhow.

I'll add a log message.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like we wrap the error with a link pointing to conflist already "failed marshalling json out of network configuration file %q: %w\nFor details on the schema, see https://pkg.go.dev/github.com/containernetworking/cni/libcni#NetworkConfigList".

Is that enough?

AkihiroSuda
AkihiroSuda reviewed Apr 17, 2025
View reviewed changes
@apostasie
Copy link
Contributor Author

Ohhhh Kubernetes... I want to punch you...

@apostasie
Copy link
Contributor Author

Failures are #4118 #4046 and #4106

@apostasie apostasie requested a review from AkihiroSuda April 18, 2025 16:40
AkihiroSuda
AkihiroSuda approved these changes Apr 18, 2025
View reviewed changes
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 546e476 into containerd:main Apr 18, 2025
67 of 71 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.0.5
Development

Successfully merging this pull request may close these issues.
2 participants
@apostasie @AkihiroSuda