• Kubernetes Submit Queue's avatar
    Merge pull request #68449 from fabriziopandini/kubeadm-annotate-cri · d472a547
    Kubernetes Submit Queue authored
    Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.
    
    kubeadm: add mandatory phase "annotate-cri"
    
    **What this PR does / why we need it**:
    In v1.12, after the changing how kubeadm-config upload/fetch, AnnotateCRISocket is now a necessary step for getting a cluster that can be upgraded using phases. This PR adds a new subcommand for letting users to invoke AnnotateCRISocket as a phase
    
    **Which issue(s) this PR fixes**:
    Fixes # https://github.com/kubernetes/kubeadm/issues/925
    
    **Special notes for your reviewer**:
    When testing this PR, I found that one of the tests on component config defaulting was broken (didn't have time to investigate why yet). This PR fixes this test as well  
    
    **Release note**:
    ```release-note
    kubeadm: added phase command "alpha phase kubelet config annotate-cri"
    ```
    @kubernetes/sig-cluster-lifecycle-pr-reviews
    /sig cluster-lifecycle
    /area kubeadm
    /assign @timothysc @neolit123 
    /kind bug
    d472a547
Name
Last commit
Last update
..
clicheck Loading commit data...
cloud-controller-manager Loading commit data...
controller-manager Loading commit data...
gendocs Loading commit data...
genkubedocs Loading commit data...
genman Loading commit data...
genswaggertypedocs Loading commit data...
genutils Loading commit data...
genyaml Loading commit data...
hyperkube Loading commit data...
importverifier Loading commit data...
kube-apiserver Loading commit data...
kube-controller-manager Loading commit data...
kube-proxy Loading commit data...
kube-scheduler Loading commit data...
kubeadm Loading commit data...
kubectl Loading commit data...
kubelet Loading commit data...
kubemark Loading commit data...
linkcheck Loading commit data...
BUILD Loading commit data...
OWNERS Loading commit data...