From 2b325be8cffe04fffcdeea1624c4320601dea7cf Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Fri, 13 Apr 2018 17:43:39 -0400 Subject: [PATCH] digitalocean: don't set --cloud-provider=external on control plane starting v1.10 --- pkg/apis/kops/validation/legacy.go | 3 ++- pkg/model/components/apiserver.go | 2 +- pkg/model/components/kubecontrollermanager.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/apis/kops/validation/legacy.go b/pkg/apis/kops/validation/legacy.go index bed5061f90..057d46831b 100644 --- a/pkg/apis/kops/validation/legacy.go +++ b/pkg/apis/kops/validation/legacy.go @@ -294,7 +294,8 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error { case kops.CloudProviderGCE: k8sCloudProvider = "gce" case kops.CloudProviderDO: - k8sCloudProvider = "external" + // cloud provider should be blank since digitalocean uses external cloud controller + k8sCloudProvider = "" case kops.CloudProviderVSphere: k8sCloudProvider = "vsphere" case kops.CloudProviderBareMetal: diff --git a/pkg/model/components/apiserver.go b/pkg/model/components/apiserver.go index 47bb3cd1e2..586761ea33 100644 --- a/pkg/model/components/apiserver.go +++ b/pkg/model/components/apiserver.go @@ -145,7 +145,7 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error { case kops.CloudProviderGCE: c.CloudProvider = "gce" case kops.CloudProviderDO: - c.CloudProvider = "external" + // not required for digitalocean since it is managed by digitalocean-cloud-controller-manager case kops.CloudProviderVSphere: c.CloudProvider = "vsphere" case kops.CloudProviderBareMetal: diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go index f78efb620a..66a3b9845e 100644 --- a/pkg/model/components/kubecontrollermanager.go +++ b/pkg/model/components/kubecontrollermanager.go @@ -105,7 +105,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error kcm.ClusterName = gce.SafeClusterName(b.Context.ClusterName) case kops.CloudProviderDO: - kcm.CloudProvider = "external" + // cloud provider is specified by digitalocean-cloud-controller-manager case kops.CloudProviderVSphere: kcm.CloudProvider = "vsphere"