github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/cmd/kube-controller-manager/app
History
Kubernetes Submit Queue 5a54555f59
Merge pull request #63049 from andrewsykim/kcm-nodeipam 
Automatic merge from submit-queue (batch tested with PRs 63049, 59731). 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>.

re-enable nodeipam in kube-controller-manager

**What this PR does / why we need it**:
Re-enables nodeipam controller for external clouds. Also does a small refactor so that we don't need to pass in `allocateNodeCidr` into the controller. 

In v1.10 we made a change (9187b343e1 (diff-f11913dc67d80d36b3d06a93f61c49cf) in https://github.com/kubernetes/kubernetes/pull/57492) where nodeipam would be disabled for any cluster that sets `--cloud-provider=external`. The original intention behind this was that the nodeipam controller is cloud specific for some clouds (only GCE at the moment) so it should be moved to the CCM (cloud controller manager). After some discussions with wg-cloud-provider it makes sense to re-enable nodeipam controller in KCM and have GCE CCM enable its own cloud-specific IPAM controller as part of [Initialize()](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go#L33-L35). This would allow for GCE to run nodeipam in both KCM (by setting --cloud-provider=gce and --allocate-node-cidr) and in the CCM (once implemented in `Initialize()`) without disabling nodeipam in the KCM for all external clouds and avoids having to implement nodeipam in CCM. 

**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**:


**Release note**:
```release-note
Re-enable nodeipam controller for external clouds. 
```
 		2018-05-11 11:07:12 -07:00
..
config Update generated files 2018-02-13 11:16:48 +01:00
options auto generated file 2018-04-13 08:57:40 +08:00
BUILD move client based restmappers to client-go 2018-05-08 08:11:56 -04:00
apps.go split up the component config into smaller config 2018-04-13 08:40:54 +08:00
autoscaling.go Add RESTMapper to ControllerContext and make it generic for controllers 2018-04-28 09:58:43 +08:00
batch.go split up the component config into smaller config 2018-04-13 08:40:54 +08:00
bootstrap.go use shared informers for TokenCleaner controller 2018-01-15 14:56:42 +08:00
certificates.go split up the component config into smaller config 2018-04-13 08:40:54 +08:00
cloudproviders.go Extract instantiation of cloud provider 2018-02-08 08:15:41 -05:00
controller_manager_test.go Using assertions 2017-10-10 22:44:12 -05:00
controllermanager.go Merge pull request #63049 from andrewsykim/kcm-nodeipam 2018-05-11 11:07:12 -07:00
core.go Merge pull request #63049 from andrewsykim/kcm-nodeipam 2018-05-11 11:07:12 -07:00
extensions.go split up the component config into smaller config 2018-04-13 08:40:54 +08:00
import_known_versions.go remove KUBE_API_VERSIONS 2018-04-26 08:27:49 -04:00
plugins.go nit: remove CSI plugin from ProbeExpandableVolumePlugins 2018-02-10 21:18:23 +08:00
policy.go
…
rbac.go add clusterrole aggregation controller 2017-11-13 08:18:00 -05:00