Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azure: Replace lb.ForAPIServer with lb.WellKnownServices #16348

Merged
merged 1 commit into from
Feb 11, 2024
Merged

azure: Replace lb.ForAPIServer with lb.WellKnownServices #16348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/model/azuremodel/api_loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/wellknownservices"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/azuretasks"
)
Expand Down Expand Up @@ -49,10 +50,11 @@ func (b *APILoadBalancerModelBuilder) Build(c *fi.CloudupModelBuilderContext) er

// Create LoadBalancer for API ELB
lb := &azuretasks.LoadBalancer{
Name: fi.PtrTo(b.NameForLoadBalancer()),
Lifecycle: b.Lifecycle,
ResourceGroup: b.LinkToResourceGroup(),
Tags: map[string]*string{},
Name: fi.PtrTo(b.NameForLoadBalancer()),
Lifecycle: b.Lifecycle,
ResourceGroup: b.LinkToResourceGroup(),
Tags: map[string]*string{},
WellKnownServices: []wellknownservices.WellKnownService{wellknownservices.KubeAPIServer},
}

switch lbSpec.Type {
Expand Down Expand Up @@ -81,7 +83,7 @@ func (b *APILoadBalancerModelBuilder) Build(c *fi.CloudupModelBuilderContext) er
c.AddTask(lb)

if b.Cluster.UsesLegacyGossip() || b.Cluster.UsesPrivateDNS() || b.Cluster.UsesNoneDNS() {
lb.ForAPIServer = true
lb.WellKnownServices = append(lb.WellKnownServices, wellknownservices.KopsController)
}

return nil
Expand Down
137 changes: 72 additions & 65 deletions upup/pkg/fi/cloudup/azuretasks/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ package azuretasks
import (
"context"
"fmt"
"slices"
"strings"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
network "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork"
"k8s.io/klog/v2"
"k8s.io/kops/pkg/wellknownports"
"k8s.io/kops/pkg/wellknownservices"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/azure"
)
Expand All @@ -40,8 +42,11 @@ type LoadBalancer struct {
// External is set to true when the loadbalancer is used for external traffic
External *bool

Tags map[string]*string
ForAPIServer bool
Tags map[string]*string

// WellKnownServices indicates which services are supported by this resource.
// This field is internal and is not rendered to the cloud.
WellKnownServices []wellknownservices.WellKnownService
}

var (
Expand All @@ -57,8 +62,8 @@ func (lb *LoadBalancer) CompareWithID() *string {

// GetWellKnownServices implements fi.HasAddress::GetWellKnownServices.
// It indicates which services we support with this load balancer.
func (lb *LoadBalancer) GetWellKnownServices() bool {
return lb.ForAPIServer
func (lb *LoadBalancer) GetWellKnownServices() []wellknownservices.WellKnownService {
return lb.WellKnownServices
}

func (lb *LoadBalancer) FindAddresses(c *fi.CloudupContext) ([]string, error) {
Expand Down Expand Up @@ -115,9 +120,9 @@ func (lb *LoadBalancer) Find(c *fi.CloudupContext) (*LoadBalancer, error) {
subnet := feConfig.Properties.Subnet

actual := &LoadBalancer{
Name: lb.Name,
Lifecycle: lb.Lifecycle,
ForAPIServer: lb.ForAPIServer,
Name: lb.Name,
Lifecycle: lb.Lifecycle,
WellKnownServices: lb.WellKnownServices,
ResourceGroup: &ResourceGroup{
Name: lb.ResourceGroup.Name,
},
Expand Down Expand Up @@ -198,70 +203,72 @@ func (*LoadBalancer) RenderAzure(t *azure.AzureAPITarget, a, e, changes *LoadBal
Name: to.Ptr("LoadBalancerBackEnd"),
},
},
Probes: []*network.Probe{
{
Name: to.Ptr("Health-TCP-443"),
Properties: &network.ProbePropertiesFormat{
Protocol: to.Ptr(network.ProbeProtocolTCP),
Port: to.Ptr[int32](wellknownports.KubeAPIServer),
IntervalInSeconds: to.Ptr[int32](15),
NumberOfProbes: to.Ptr[int32](4),
},
},
Tags: e.Tags,
}

if slices.Contains(e.WellKnownServices, wellknownservices.KubeAPIServer) {
lb.Properties.Probes = append(lb.Properties.Probes, &network.Probe{
Name: to.Ptr("Health-TCP-443"),
Properties: &network.ProbePropertiesFormat{
Protocol: to.Ptr(network.ProbeProtocolTCP),
Port: to.Ptr[int32](wellknownports.KubeAPIServer),
IntervalInSeconds: to.Ptr[int32](15),
NumberOfProbes: to.Ptr[int32](4),
},
})
lb.Properties.LoadBalancingRules = append(lb.Properties.LoadBalancingRules, &network.LoadBalancingRule{
Name: to.Ptr("TCP-443"),
Properties: &network.LoadBalancingRulePropertiesFormat{
Protocol: to.Ptr(network.TransportProtocolTCP),
FrontendPort: to.Ptr[int32](wellknownports.KubeAPIServer),
BackendPort: to.Ptr[int32](wellknownports.KubeAPIServer),
IdleTimeoutInMinutes: to.Ptr[int32](4),
EnableFloatingIP: to.Ptr(false),
LoadDistribution: to.Ptr(network.LoadDistributionDefault),
FrontendIPConfiguration: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/frontendIPConfigurations/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerFrontEnd"))),
},
{
Name: to.Ptr("Health-TCP-3988"),
Properties: &network.ProbePropertiesFormat{
Protocol: to.Ptr(network.ProbeProtocolTCP),
Port: to.Ptr[int32](wellknownports.KopsControllerPort),
IntervalInSeconds: to.Ptr[int32](15),
NumberOfProbes: to.Ptr[int32](4),
},
BackendAddressPool: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/backendAddressPools/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerBackEnd"))),
},
Probe: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/probes/%s", idPrefix, *e.Name, *to.Ptr("Health-TCP-443"))),
},
},
LoadBalancingRules: []*network.LoadBalancingRule{
{
Name: to.Ptr("TCP-443"),
Properties: &network.LoadBalancingRulePropertiesFormat{
Protocol: to.Ptr(network.TransportProtocolTCP),
FrontendPort: to.Ptr[int32](wellknownports.KubeAPIServer),
BackendPort: to.Ptr[int32](wellknownports.KubeAPIServer),
IdleTimeoutInMinutes: to.Ptr[int32](4),
EnableFloatingIP: to.Ptr(false),
LoadDistribution: to.Ptr(network.LoadDistributionDefault),
FrontendIPConfiguration: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/frontendIPConfigurations/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerFrontEnd"))),
},
BackendAddressPool: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/backendAddressPools/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerBackEnd"))),
},
Probe: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/probes/%s", idPrefix, *e.Name, *to.Ptr("Health-TCP-443"))),
},
},
})
}

if slices.Contains(e.WellKnownServices, wellknownservices.KopsController) {
lb.Properties.Probes = append(lb.Properties.Probes, &network.Probe{
Name: to.Ptr("Health-TCP-3988"),
Properties: &network.ProbePropertiesFormat{
Protocol: to.Ptr(network.ProbeProtocolTCP),
Port: to.Ptr[int32](wellknownports.KopsControllerPort),
IntervalInSeconds: to.Ptr[int32](15),
NumberOfProbes: to.Ptr[int32](4),
},
})
lb.Properties.LoadBalancingRules = append(lb.Properties.LoadBalancingRules, &network.LoadBalancingRule{
Name: to.Ptr("TCP-3988"),
Properties: &network.LoadBalancingRulePropertiesFormat{
Protocol: to.Ptr(network.TransportProtocolTCP),
FrontendPort: to.Ptr[int32](wellknownports.KopsControllerPort),
BackendPort: to.Ptr[int32](wellknownports.KopsControllerPort),
IdleTimeoutInMinutes: to.Ptr[int32](4),
EnableFloatingIP: to.Ptr(false),
LoadDistribution: to.Ptr(network.LoadDistributionDefault),
FrontendIPConfiguration: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/frontendIPConfigurations/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerFrontEnd"))),
},
{
Name: to.Ptr("TCP-3988"),
Properties: &network.LoadBalancingRulePropertiesFormat{
Protocol: to.Ptr(network.TransportProtocolTCP),
FrontendPort: to.Ptr[int32](wellknownports.KopsControllerPort),
BackendPort: to.Ptr[int32](wellknownports.KopsControllerPort),
IdleTimeoutInMinutes: to.Ptr[int32](4),
EnableFloatingIP: to.Ptr(false),
LoadDistribution: to.Ptr(network.LoadDistributionDefault),
FrontendIPConfiguration: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/frontendIPConfigurations/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerFrontEnd"))),
},
BackendAddressPool: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/backendAddressPools/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerBackEnd"))),
},
Probe: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/probes/%s", idPrefix, *e.Name, *to.Ptr("Health-TCP-3988"))),
},
},
BackendAddressPool: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/backendAddressPools/%s", idPrefix, *e.Name, *to.Ptr("LoadBalancerBackEnd"))),
},
Probe: &network.SubResource{
ID: to.Ptr(fmt.Sprintf("/%s/loadbalancers/%s/probes/%s", idPrefix, *e.Name, *to.Ptr("Health-TCP-3988"))),
},
},
},
Tags: e.Tags,
})
}

_, err := t.Cloud.LoadBalancer().CreateOrUpdate(
Expand Down
6 changes: 4 additions & 2 deletions upup/pkg/fi/cloudup/azuretasks/loadbalancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (
"reflect"
"testing"

"k8s.io/kops/pkg/wellknownservices"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
network "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork"
"k8s.io/kops/upup/pkg/fi"
Expand All @@ -42,8 +44,8 @@ func newTestLoadBalancer() *LoadBalancer {
Name: to.Ptr("vnet"),
},
},
External: to.Ptr(true),
ForAPIServer: true,
External: to.Ptr(true),
WellKnownServices: []wellknownservices.WellKnownService{wellknownservices.KubeAPIServer},
Tags: map[string]*string{
testTagKey: to.Ptr(testTagValue),
},
Expand Down
Loading