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

Merge pull request #15815 from justinsb/do_gossip 

Fix gossip on DigitalOcean
This commit is contained in:
Kubernetes Prow Robot 2023-08-23 07:53:29 -07:00 committed by GitHub
parent c701791a66 8b99c79631
commit 69fbdcdf55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/model/features.go
View File

@ -44,8 +44,8 @@ func UseKopsControllerForNodeConfig(cluster *kops.Cluster) bool {
switch cluster.Spec.GetCloudProvider() { switch cluster.Spec.GetCloudProvider() {
case kops.CloudProviderGCE: case kops.CloudProviderGCE:
// We can use cloud-discovery here. // We can use cloud-discovery here.
case kops.CloudProviderHetzner, kops.CloudProviderScaleway: case kops.CloudProviderHetzner, kops.CloudProviderScaleway, kops.CloudProviderDO:
// We don't have a cloud-discovery mechanism implemented in nodeup for hetzner, // We don't have a cloud-discovery mechanism implemented in nodeup for many clouds,
// but we assume that we're using a load balancer with a fixed IP address // but we assume that we're using a load balancer with a fixed IP address
default: default:
return false return false

4
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -1458,8 +1458,10 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit
bootConfig.APIServerIPs = controlPlaneIPs bootConfig.APIServerIPs = controlPlaneIPs
} else { } else {
// If we do have a fixed IP, we use it (on some clouds, initially) // If we do have a fixed IP, we use it (on some clouds, initially)
// This covers the clouds in UseKopsControllerForNodeConfig which use kops-controller for node config,
// but don't have a specialized discovery mechanism for finding kops-controller etc.
switch cluster.Spec.GetCloudProvider() { switch cluster.Spec.GetCloudProvider() {
case kops.CloudProviderHetzner, kops.CloudProviderScaleway: case kops.CloudProviderHetzner, kops.CloudProviderScaleway, kops.CloudProviderDO:
bootConfig.APIServerIPs = controlPlaneIPs bootConfig.APIServerIPs = controlPlaneIPs
} }
} }