Skip to content

call subnet auto discovery when lb scheme changes #2387

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

Merged
merged 2 commits into from
Dec 2, 2021
Merged

call subnet auto discovery when lb scheme changes #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9dc5e1
call subnet auto discovery when lb scheme changes
oliviassss Dec 1, 2021
35a23e6
add unit tests
oliviassss Dec 1, 2021
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
2 changes: 1 addition & 1 deletion pkg/ingress/model_build_load_balancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func (t *defaultModelBuildTask) buildLoadBalancerSubnetMappings(ctx context.Cont
return nil, err
}

if len(sdkLBs) == 0 {
if len(sdkLBs) == 0 || (string(scheme) != awssdk.StringValue(sdkLBs[0].LoadBalancer.Scheme)) {
chosenSubnets, err := t.subnetsResolver.ResolveViaDiscovery(ctx,
networking.WithSubnetsResolveLBType(elbv2model.LoadBalancerTypeApplication),
networking.WithSubnetsResolveLBScheme(scheme),
Expand Down
3 changes: 3 additions & 0 deletions pkg/ingress/model_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,6 +2453,7 @@ func Test_defaultModelBuilder_Build(t *testing.T) {
SubnetId: awssdk.String("subnet-f"),
},
},
Scheme: awssdk.String("internal"),
},
Tags: map[string]string{
"elbv2.k8s.aws/cluster": "cluster-name",
Expand All @@ -2470,6 +2471,7 @@ func Test_defaultModelBuilder_Build(t *testing.T) {
SubnetId: awssdk.String("subnet-f"),
},
},
Scheme: awssdk.String("internal"),
},
Tags: map[string]string{
"keyA": "valueA2",
Expand All @@ -2487,6 +2489,7 @@ func Test_defaultModelBuilder_Build(t *testing.T) {
SubnetId: awssdk.String("subnet-f"),
},
},
Scheme: awssdk.String("internal"),
},
Tags: map[string]string{
"keyA": "valueA3",
Expand Down
2 changes: 1 addition & 1 deletion pkg/service/model_build_load_balancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (t *defaultModelBuildTask) buildLoadBalancerSubnets(ctx context.Context, sc
if err != nil {
return nil, err
}
if existingLB != nil {
if existingLB != nil && string(scheme) == aws.StringValue(existingLB.LoadBalancer.Scheme) {
availabilityZones := existingLB.LoadBalancer.AvailabilityZones
subnetIDs := make([]string, 0, len(availabilityZones))
for _, availabilityZone := range availabilityZones {
Expand Down
108 changes: 93 additions & 15 deletions pkg/service/model_build_load_balancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,8 @@ func Test_defaultModelBuilderTask_buildLoadBalancerSubnets(t *testing.T) {
listLoadBalancersCalls []listLoadBalancerCall
resolveViaDiscoveryCalls []resolveSubnetResults
resolveViaNameOrIDSlilceCalls []resolveSubnetResults
want map[string]string
want []*ec2.Subnet
wantErr error
}{
{
name: "subnet auto-discovery",
Expand All @@ -579,9 +580,15 @@ func Test_defaultModelBuilderTask_buildLoadBalancerSubnets(t *testing.T) {
},
},
},
want: map[string]string{
"elbv2.k8s.aws/cluster": "cluster-name",
"service.k8s.aws/stack": "namespace/serviceName",
want: []*ec2.Subnet{
{
SubnetId: aws.String("subnet-a"),
CidrBlock: aws.String("192.168.0.0/19"),
},
{
SubnetId: aws.String("subnet-b"),
CidrBlock: aws.String("192.168.32.0/19"),
},
},
},
{
Expand Down Expand Up @@ -610,13 +617,19 @@ func Test_defaultModelBuilderTask_buildLoadBalancerSubnets(t *testing.T) {
},
},
},
want: map[string]string{
"elbv2.k8s.aws/cluster": "cluster-name",
"service.k8s.aws/stack": "namespace/serviceName",
want: []*ec2.Subnet{
{
SubnetId: aws.String("subnet-abc"),
CidrBlock: aws.String("192.168.0.0/19"),
},
{
SubnetId: aws.String("subnet-xyz"),
CidrBlock: aws.String("192.168.0.0/19"),
},
},
},
{
name: "subnet resolve via Name or ID",
name: "subnet resolve via Name or ID, with existing LB and scheme wouldn't change",
svc: &corev1.Service{},
scheme: elbv2.LoadBalancerSchemeInternal,
provider: tracking.NewDefaultProvider("service.k8s.aws", "cluster-name"),
Expand All @@ -635,6 +648,7 @@ func Test_defaultModelBuilderTask_buildLoadBalancerSubnets(t *testing.T) {
SubnetId: aws.String("subnet-d"),
},
},
Scheme: aws.String("internal"),
},
Tags: map[string]string{
"elbv2.k8s.aws/cluster": "cluster-name",
Expand All @@ -658,9 +672,70 @@ func Test_defaultModelBuilderTask_buildLoadBalancerSubnets(t *testing.T) {
},
},
},
want: map[string]string{
"elbv2.k8s.aws/cluster": "cluster-name",
"service.k8s.aws/stack": "namespace/serviceName",
want: []*ec2.Subnet{
{
SubnetId: aws.String("subnet-c"),
CidrBlock: aws.String("192.168.0.0/19"),
},
{
SubnetId: aws.String("subnet-d"),
CidrBlock: aws.String("192.168.0.0/19"),
},
},
},
{
name: "subnet auto discovery, with existing LB and scheme would change",
svc: &corev1.Service{},
scheme: elbv2.LoadBalancerSchemeInternal,
provider: tracking.NewDefaultProvider("service.k8s.aws", "cluster-name"),
args: args{stack: core.NewDefaultStack(core.StackID{Namespace: "namespace", Name: "serviceName"})},
listLoadBalancersCalls: []listLoadBalancerCall{
{
sdkLBs: []elbv2deploy.LoadBalancerWithTags{
{
LoadBalancer: &elbv2sdk.LoadBalancer{
LoadBalancerArn: aws.String("lb-1"),
AvailabilityZones: []*elbv2sdk.AvailabilityZone{
{
SubnetId: aws.String("subnet-c"),
},
{
SubnetId: aws.String("subnet-d"),
},
},
Scheme: aws.String("internet-facing"),
},
Tags: map[string]string{
"elbv2.k8s.aws/cluster": "cluster-name",
"service.k8s.aws/stack": "namespace/serviceName",
},
},
},
},
},
resolveViaDiscoveryCalls: []resolveSubnetResults{
{
subnets: []*ec2.Subnet{
{
SubnetId: aws.String("subnet-a"),
CidrBlock: aws.String("192.168.0.0/19"),
},
{
SubnetId: aws.String("subnet-b"),
CidrBlock: aws.String("192.168.0.0/19"),
},
},
},
},
want: []*ec2.Subnet{
{
SubnetId: aws.String("subnet-a"),
CidrBlock: aws.String("192.168.0.0/19"),
},
{
SubnetId: aws.String("subnet-b"),
CidrBlock: aws.String("192.168.0.0/19"),
},
},
},
}
Expand Down Expand Up @@ -695,10 +770,13 @@ func Test_defaultModelBuilderTask_buildLoadBalancerSubnets(t *testing.T) {
trackingProvider: trackingProvider,
elbv2TaggingManager: elbv2TaggingManager,
}
var got = tt.provider.StackTags(tt.args.stack)
assert.Equal(t, tt.want, got)

builder.buildLoadBalancerSubnets(context.Background(), tt.scheme)
got, err := builder.buildLoadBalancerSubnets(context.Background(), tt.scheme)
if tt.wantErr != nil {
assert.EqualError(t, err, tt.wantErr.Error())
} else {
assert.NoError(t, err)
assert.Equal(t, tt.want, got)
}
})
}
}
Expand Down