Skip to content

Commit

Permalink
GCE: we can use kops-controller even in gossip mode
Browse files Browse the repository at this point in the history
Now that we have the resolver set, we don't depend on protokube.
Without this PR we have a circular dependency.
  • Loading branch information
justinsb committed Feb 5, 2023
1 parent 1df5711 commit 4d02390
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pkg/apis/kops/model/features.go
Expand Up @@ -38,9 +38,15 @@ func UseKopsControllerForNodeBootstrap(cluster *kops.Cluster) bool {

// UseKopsControllerForNodeConfig checks if nodeup should use kops-controller to get nodeup.Config.
func UseKopsControllerForNodeConfig(cluster *kops.Cluster) bool {
if cluster.IsGossip() {
return false
switch cluster.Spec.GetCloudProvider() {
case kops.CloudProviderGCE:
// We can use cloud-discovery here.
default:
if cluster.IsGossip() {
return false
}
}

return UseKopsControllerForNodeBootstrap(cluster)
}

Expand Down

0 comments on commit 4d02390

Please sign in to comment.