mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-12-08 10:26:41 +00:00
d0cf4de51f
Automatic merge from submit-queue (batch tested with PRs 55301, 55319, 54018, 55322, 55125). 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>. Add support for configmap resource lock type to CCM **What this PR does / why we need it**: Adds support for configmap resource locks which can be specified currently via CLI args to the CCM. Currently the `--leader-elect-resource-lock=configmaps` is ignored. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #55124 ```release-note Fix support for configmap resource lock type in CCM ``` /cc @wlan0 @luxas @andrewsykim @prydie Output after running with this flag. ``` $ kubectl -n kube-system get cm cloud-controller-manager -oyaml apiVersion: v1 kind: ConfigMap metadata: annotations: control-plane.alpha.kubernetes.io/leader: '{"holderIdentity":"<host>-external-cloud-controller","leaseDurationSeconds":15,"acquireTime":"2017-11-06T00:14:41Z","renewTime":"2017-11-06T00:17:54Z","leaderTransitions":0}' creationTimestamp: 2017-11-06T00:14:41Z name: cloud-controller-manager namespace: kube-system resourceVersion: "2548197" selfLink: /api/v1/namespaces/kube-system/configmaps/cloud-controller-manager uid: 7c4cfe24-c287-11e7-99e4-0000170192f0 ```