-
Notifications
You must be signed in to change notification settings - Fork 39.2k
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
On GCI, cleanup kubelet startup #35319
Conversation
Jenkins verification failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
@k8s-bot test this |
@@ -1167,6 +1165,9 @@ For Kubernetes copyright and licensing information, see: | |||
EOF | |||
} | |||
|
|||
function override-kubectl { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer if we could edit the user's path rather than use a bindmount.
This bindmount will not survive a reboot, and afaik this isn't re-run on each boot, so this won't persist.
Editing the PATH (preferably with something like Gentoo's /etc/env.d
if GCI has such an option) seems saner to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adityakali Any opinions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can add it under /etc/profile.d/
. For ex:
cat /etc/profile.d/kubelet_env.sh
export PATH="/home/kubernetes/bin:$PATH"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sweet. Updated. PTAL
Jenkins Kubemark GCE e2e failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
Jenkins GCI GCE e2e failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
Jenkins GCE etcd3 e2e failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
Jenkins GCE e2e failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
Jenkins GKE smoke e2e failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
Jenkins GCI GKE smoke e2e failed for commit 184e355. Full PR test history. The magic incantation to run this job again is |
@euank @adityakali @mtaufen PTAL |
LGTM |
@@ -1167,6 +1165,9 @@ For Kubernetes copyright and licensing information, see: | |||
EOF | |||
} | |||
|
|||
function override-kubectl { | |||
echo "export PATH={KUBE_HOME}/bin:$PATH" > /etc/profile.d/kube_env.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't $PATH
end up getting resolved in echo
command itself? You may want to escape the $
. Try it out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, and, it looks like KUBE_HOME
is missing the $
as well (we would want it to be resolved here)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Err. Sorry for being sloppy. Fixed it.
…h that of the release Signed-off-by: Vishnu kannan <vishnuk@google.com>
…19-origin-release-1.4 Automated cherry pick of #35319
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
Automatic merge from submit-queue |
this was cherrypicked into 1.4.5 |
…ck-of-#35319-origin-release-1.4 Automated cherry pick of kubernetes#35319
-->
cc @kubernetes/sig-node @mtaufen
This change is![Reviewable](https://camo.githubusercontent.com/2d899f4291d07d3cd2fa4aaae1e3b243f164c23fce87d30a589ace0d496a444c/68747470733a2f2f72657669657761626c652e6b756265726e657465732e696f2f7265766965775f627574746f6e2e737667)