Fix 'node-init' in GKE's 'cos' images. #19017
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
|
|
This was referenced Mar 3, 2022
bmcustodio
added
release-note/bug
|
/test Job 'Cilium-PR-K8s-1.21-kernel-5.4' failed: Click to show.Test NameFailure OutputIf it is a flake and a GitHub issue doesn't already exist to track it, comment |
aanm
approved these changes
Mar 3, 2022
bmcustodio
force-pushed
the
pr/bruno/fix-gke-cos-node-init
branch
from
3e2f9f9 to
a664df3
Compare
kaworu
reviewed
Mar 3, 2022
|
Commit 0bcb736535ff497260806efc36f11578bab2a3b3 does not contain "Signed-off-by". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
maintainer-s-little-helper
bot
added
the
dont-merge/needs-sign-off
Turns out that in GKE's 'cos' images the 'containerd' binary is still present even though '/etc/containerd/config.toml' is not. Hence, the kubelet wrapper would still be installed for these images according to the current check, even though it's not necessary. What's worse, starting the kubelet would fail because the 'sed' command targeting the aforementioned file would fail. This PR changes the check to rely on the presence of the '--container-runtime-endpoint' flag in the kubelet, which is probably a more reliable way of detecting '*_containerd' flavours and only applying the fix in these cases. Fixes cilium#19015. Signed-off-by: Bruno M. Custódio <[email protected]> Co-authored-by: Alexandre Perrin <[email protected]>
bmcustodio
force-pushed
the
pr/bruno/fix-gke-cos-node-init
branch
from
0bcb736 to
b5f3479
Compare
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-sign-off
kaworu
approved these changes
Mar 4, 2022
|
/test |
This was referenced Mar 26, 2022
qmonnet
added
backport-done/1.11
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Turns out that in GKE's
cosimages thecontainerdbinary is still present even though/etc/containerd/config.tomlis not. Hence, the kubelet wrapper would still be installed for these images according to the current check, even though it's not necessary. What's worse, starting the kubelet would fail because thesedcommand targeting the aforementioned file would fail.This PR changes the check to rely on the presence of the
--container-runtime-endpointflag in the kubelet, which is probably a more reliable way of detecting*_containerdflavours and only applying the fix in these cases.Fixes #19015.