Merge pull request #65231 from luxas/fix_changelog

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix a changelog entry in v1.11 **What this PR does / why we need it**: Fixes the comment in https://github.com/kubernetes/kubernetes/pull/64792#issuecomment-395781753 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: Do we want to merge this now? **Release note**: ```release-note NONE ``` @php-coder @jberkus @timothysc /kind cleanup /sig cluster-lifecycle

Merge pull request #65231 from luxas/fix_changelog
3994829c · Kubernetes Submit Queue · GitHub · 56d8f8af · 3369291e · 3994829c
Unverified Commit 3994829c authored Jun 19, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

CHANGELOG-1.11.md CHANGELOG-1.11.md +8 -1

No files found.
--- a/CHANGELOG-1.11.md
+++ b/CHANGELOG-1.11.md
@@ -87,7 +87,14 @@ filename | sha256 hash

 ### Action Required

-* [action required] TODO ([#64792](https://github.com/kubernetes/kubernetes/pull/64792), [@luxas](https://github.com/luxas))
+* [action required] `kubeadm join` is now blocking on the kubelet performing the TLS Bootstrap properly. ([#64792](https://github.com/kubernetes/kubernetes/pull/64792), [@luxas](https://github.com/luxas))
+    * Earlier, `kubeadm join` only did the discovery part and exited successfully without checking that the
+    * kubelet actually started properly and performed the TLS bootstrap correctly. Now, as kubeadm runs
+    * some post-join steps (e.g. annotating the Node API object with the CRISocket as in this PR, as a
+    * stop-gap until this is discoverable automatically), `kubeadm join` is now waiting for the kubelet to
+    * perform the TLS Bootstrap, and then uses that credential to perform further actions. This also
+    * improves the UX, as `kubeadm` will exit with a non-zero code if the kubelet isn't in a functional
+    * state, instead of pretending like everything's fine.
 * [action required] The structure of the kubelet dropin in the kubeadm deb package has changed significantly. ([#64780](https://github.com/kubernetes/kubernetes/pull/64780), [@luxas](https://github.com/luxas))
    * Instead of hard-coding the parameters for the kubelet in the dropin, a structured configuration file
    * for the kubelet is used, and is expected to be present in `/var/lib/kubelet/config.yaml`.