kubernetes

mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-25 19:05:13 +00:00

Files

Kubernetes Submit Queue d472a54777 Merge pull request #68449 from fabriziopandini/kubeadm-annotate-cri

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

2018-09-10 10:27:25 -07:00

clicheck

wire config flags through factory

2018-05-04 17:02:20 -04:00

cloud-controller-manager

Merge pull request #68195 from luxas/consolidate_componentconfig_code_standards

2018-09-07 11:19:40 -07:00

controller-manager

[kube-controller-manager] auto-generated file

2018-09-04 19:40:10 +08:00

gendocs

wire config flags through factory