Skip to content

Commit 4fb6bbb

Browse files
committed
azure: enable hybrid mode for gossip clusters
Expose kops-controller on the cluster load balancer for gossip Azure clusters with an API LB. Drop the unused UsesPrivateDNS clause.
1 parent ae182ac commit 4fb6bbb

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

pkg/apis/kops/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ func (c *Cluster) UsesLoadBalancerForKopsController() bool {
987987
return lb != nil && lb.Class == LoadBalancerClassNetwork
988988
case CloudProviderHetzner:
989989
return true
990-
case CloudProviderDO, CloudProviderGCE, CloudProviderOpenstack, CloudProviderScaleway:
990+
case CloudProviderAzure, CloudProviderDO, CloudProviderGCE, CloudProviderOpenstack, CloudProviderScaleway:
991991
return c.Spec.API.LoadBalancer != nil
992992
default:
993993
return false

pkg/model/azuremodel/api_loadbalancer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (b *APILoadBalancerModelBuilder) Build(c *fi.CloudupModelBuilderContext) er
104104
return fmt.Errorf("unknown load balancer Type: %q", lbSpec.Type)
105105
}
106106

107-
if b.Cluster.UsesLegacyGossip() || b.Cluster.UsesPrivateDNS() || b.Cluster.UsesNoneDNS() {
107+
if b.Cluster.UsesLoadBalancerForKopsController() {
108108
lb.WellKnownServices = append(lb.WellKnownServices, wellknownservices.KopsController)
109109

110110
// kops-controller probe: HTTPS on 3988 with /healthz

0 commit comments

Comments
 (0)