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

Fix CONTAINER_ID with PodSandboxID #213

Merged
merged 3 commits into from
Apr 11, 2024

Conversation

LionelJouin
Copy link
Collaborator

What this PR does / why we need it:
ADD and DEL were called with the ID of the first container found in the pod spec while the PodSandboxID was required.

Refactoring has been done to remove the CRI-O and Containerd communication. Instead, only the CRI API is used.

Which issue(s) this PR fixes:
Fixes #209

Special notes for your reviewer (optional):
E2e for CRI-O and Containerd are still needed, and e2e with a CNI that uses CONTAINER_ID might also be needed.

@LionelJouin LionelJouin requested a review from maiqueb as a code owner March 12, 2024 19:28
@LionelJouin LionelJouin force-pushed the sandboxid branch 3 times, most recently from 1fc8523 to 1baa88b Compare March 15, 2024 16:12
@maiqueb
Copy link
Collaborator

maiqueb commented Mar 22, 2024

@LionelJouin could you please keep the vendoring changes in an isolated commit ?

the github UI doesn't handle well all the changes in this PR (and I'd say 98% of it is on the vendor folder)...

That'd help me :)

@LionelJouin
Copy link
Collaborator Author

Done

Copy link
Collaborator

@maiqueb maiqueb left a comment

Choose a reason for hiding this comment

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

couple of questions; a bit concerned about the kubelet go mod change.

Also, shouldn't we remove the criType attributes from the CRIO manifest ?

.golangci.yml Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
Fixes k8snetworkplumbingwg#209

ADD and DEL were called with the ID of the first container found in the
pod spec while the PodSandboxID was required.

Refactoring has been done to remove the CRI-O and Containerd
communication. Instead, only the CRI API is used.
Use of Pod UID instead of Name/Namespace to get the podSandBoxId and
NetNs with the CRI API. Using Pod/Namespace might not be unique if a pod
is deleted/created, UID will be unique.
@LionelJouin
Copy link
Collaborator Author

I removed crio from the yaml file in the second commit Use pod UID instead of Name/Namespace

@maiqueb maiqueb merged commit 953f7fc into k8snetworkplumbingwg:main Apr 11, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Can't hotunplug podInterface which is not hotplug and primaryPodInterface(eth0)
2 participants