kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4990 from andrewsykim/external-cloud-1.10 

digitalocean: don't set --cloud-provider=external on control plane starting v1.10
This commit is contained in:
k8s-ci-robot 2018-05-12 14:36:25 -07:00 committed by GitHub
parent 7c90ef0bab 2b325be8cf
commit a717a035d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/apis/kops/validation/legacy.go
View File

@ -301,7 +301,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:

2
pkg/model/components/apiserver.go
View File

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

2
pkg/model/components/kubecontrollermanager.go
View File

@ -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"