Skip to content

nodeinit: Move kubelet version check to expected branch #21772

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 1 commit into from
Oct 21, 2022
Merged

nodeinit: Move kubelet version check to expected branch #21772

merged 1 commit into from
Oct 21, 2022

Conversation

dctrwatson
Copy link
Contributor

Signed-off-by: John Watson johnw@planetscale.com

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Thanks for contributing!

This fixes:

  • kubelet isn't in PATH in the container (at least for Canonical's GKE image)
  • K8S_VERSION is unset for the non-GKE containerd flavor

Fixes: 1d6770b

@dctrwatson
nodeinit: Move kubelet version check to expected branch
5a55c77 
Signed-off-by: John Watson <johnw@planetscale.com>
@dctrwatson dctrwatson requested review from a team as code owners October 17, 2022 21:22
@dctrwatson dctrwatson requested review from squeed and kaworu October 17, 2022 21:22
@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 Oct 17, 2022
@joestringer joestringer added the release-note/bug This PR fixes an issue in a previous release of Cilium. label Oct 17, 2022
@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 Oct 17, 2022
pippolo84
pippolo84 approved these changes Oct 18, 2022
View reviewed changes
Copy link
Member

@pippolo84 pippolo84 left a comment

Choose a reason for hiding this comment

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

Good catch, thanks! 💯

@aanm aanm merged commit c4a4ceb into cilium:master Oct 21, 2022
@pchaigno pchaigno mentioned this pull request Nov 7, 2022
Merged
@michi-covalent michi-covalent mentioned this pull request Nov 16, 2022
Merged
@joestringer joestringer added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Nov 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaworu kaworu kaworu approved these changes

@squeed squeed squeed approved these changes

@pippolo84 pippolo84 pippolo84 approved these changes

@bmcustodio bmcustodio Awaiting requested review from bmcustodio

Assignees
No one assigned
Labels
backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dctrwatson @kaworu @squeed @pippolo84 @joestringer @pchaigno @aanm