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

[Backport] fix: remove --containerd Kubelet cAdvisor arg. (#835) #836

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

bschimke95
Copy link
Contributor

This patch removes the passing of the --containerd argument (value should be path to containerd socket) to kubelet.

This argument is actually not a kubelet argument per se, but instead it is a cAdvisor argument (1) which was accidentally transparently declared and shipped in kubelet a very long time ago, but had been explicitly declared within kubelet and marked deprecated since 2017 (2).

[1] https://github.com/google/cadvisor/blob/3888dda254a8fa12f1c96be24ffdc33288ea9071/container/containerd/factory.go#L34
[2] https://github.com/kubernetes/kubernetes/pull/57613/files#diff-fecc7baa0b61f11d37dfc453aef25acca98866e1924f7765ba5592ca58fc3045R143

This patch removes the passing of the `--containerd` argument
(value should be path to containerd socket) to `kubelet`.

This argument is actually not a kubelet argument per se, but instead it
is a cAdvisor argument (1) which was accidentally transparently declared
and shipped in kubelet a very long time ago, but had been explicitly
declared within kubelet and marked deprecated since 2017 (2).

[1] https://github.com/google/cadvisor/blob/3888dda254a8fa12f1c96be24ffdc33288ea9071/container/containerd/factory.go#L34
[2] https://github.com/kubernetes/kubernetes/pull/57613/files#diff-fecc7baa0b61f11d37dfc453aef25acca98866e1924f7765ba5592ca58fc3045R143

Signed-off-by: Nashwan Azhari <[email protected]>
@bschimke95 bschimke95 requested a review from a team as a code owner November 24, 2024 20:12
Copy link
Member

@berkayoz berkayoz left a comment

Choose a reason for hiding this comment

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

LGTM

@bschimke95 bschimke95 merged commit b7c9ec4 into release-1.31 Nov 25, 2024
18 checks passed
@bschimke95 bschimke95 deleted the backport-containerd-args branch November 25, 2024 08:09
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.

3 participants