Add apimachinery changes to enable cloud controller manager #3408
Conversation
k8s-ci-robot
added
the
size/L
|
/assign chrislovecnm |
|
@chrislovecnm Just as we discussed this is the first PR in a series of PR to enable cloud controller manager support in kops. This adds the apimachinery changes required for this change. We decided to do apimachinery changes first because then it gives people enough time to review this, and make changes if needed. This is also feature gated, and if enabled, it no-ops. There is no harm in merging this. |
|
Ci is not happy |
k8s-ci-robot
added
the
cncf-cla: yes
pkg/apis/kops/cluster.go
Outdated
| KubeDNS *KubeDNSConfig `json:"kubeDNS,omitempty"` | ||
| KubeAPIServer *KubeAPIServerConfig `json:"kubeAPIServer,omitempty"` | ||
| KubeControllerManager *KubeControllerManagerConfig `json:"kubeControllerManager,omitempty"` | ||
| CloudControllerManager *CloudControllerManagerConfig `json:"cloudControllerManager,omitempty"` |
There was a problem hiding this comment.
Sorry to nit pick. ExternalCloudControllerManager?
cmd/kops/create_cluster.go
Outdated
| @@ -103,6 +103,9 @@ type CreateClusterOptions struct { | |||
| // Egress configuration - FOR TESTING ONLY | |||
| Egress string | |||
|
|
|||
There was a problem hiding this comment.
You won't have any changes in this file at all, just remove them
There was a problem hiding this comment.
Yeah, it felt like featureflag + cli was overkill. I'll remove it
cmd/kops/create_cluster.go
Outdated
| @@ -369,6 +370,10 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e | |||
| } | |||
| cluster.Spec.Channel = c.Channel | |||
|
|
|||
| if featureflag.EnableExternalCloudController.Enabled() { | |||
There was a problem hiding this comment.
Not sure if this is needed or not, but I added it anyways since this is the only way to enable CCM now.
There was a problem hiding this comment.
We don't even need it here. This is simply to get the API in unwired.
| KubeDNS *KubeDNSConfig `json:"kubeDNS,omitempty"` | ||
| KubeAPIServer *KubeAPIServerConfig `json:"kubeAPIServer,omitempty"` | ||
| KubeControllerManager *KubeControllerManagerConfig `json:"kubeControllerManager,omitempty"` | ||
| ExternalCloudControllerManager *CloudControllerManagerConfig `json:"cloudControllerManager,omitempty"` |
There was a problem hiding this comment.
Updated to ExternalCloudControllerManager
This is part I of multi part Pull Request to enable the cloud-controller-manager through kops. This specific PR introduces the cloud-controller-manager api, and puts it behind a feature flag. Please feel free to merge this.
|
@chrislovecnm Updated the PR |
|
The logs make me think that the Jenkins failure is a flake. |
|
/test pull-kops-e2e-kubernetes-aws |
|
/lgtm @wlan0 we need release notes that this is just getting put in place if we cut a release before these are wired in. |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chrislovecnm The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
k8s-github-robot
added
the
approved
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue. . |
Automatic merge from submit-queue. Add Cloud Controller Manager addon This adds the CCM addon for the Kubernetes cluster. This is a follow-up PR to #3408. cc @chrislovecnm @andrewsykim
This is part I of multi part Pull Request to enable the
cloud-controller-manager through kops. This specific PR introduces the
cloud-controller-manager api, and puts it behind a feature flag.
Please feel free to merge this.