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

Jump to bottom

Add support for specifying source ranges for NLB #1492

Merged
merged 2 commits into from
Oct 13, 2020
Merged

Add support for specifying source ranges for NLB #1492

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05708cb
add support for specifying source ranges for NLB
kishorj Oct 13, 2020
49d22da
address comments
kishorj Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/annotations/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const (

// NLB annotation suffixes
// prefixes service.beta.kubernetes.io, service.kubernetes.io
SvcLBSuffixSourceRanges = "load-balancer-source-ranges"
SvcLBSuffixLoadBalancerType = "aws-load-balancer-type"
SvcLBSuffixInternal = "aws-load-balancer-internal"
SvcLBSuffixProxyProtocol = "aws-load-balancer-proxy-protocol"
Expand Down
59 changes: 47 additions & 12 deletions pkg/service/nlb/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,41 +486,76 @@ func (t *defaultModelBuildTask) buildTargetGroupBinding(ctx context.Context, tar
})
}

func (t *defaultModelBuildTask) buildTargetGroupBindingNetworking(_ context.Context, tgPort intstr.IntOrString, hcPort intstr.IntOrString,
func (t *defaultModelBuildTask) buildPeersFromSourceRanges(_ context.Context) []elbv2model.NetworkingPeer {
var sourceRanges []string
var peers []elbv2model.NetworkingPeer
for _, cidr := range t.service.Spec.LoadBalancerSourceRanges {
sourceRanges = append(sourceRanges, cidr)
}
if len(sourceRanges) == 0 {
t.annotationParser.ParseStringSliceAnnotation(annotations.SvcLBSuffixSourceRanges, &sourceRanges, t.service.Annotations)
}
if len(sourceRanges) == 0 {
sourceRanges = append(sourceRanges, "0.0.0.0/0")
}
for _, cidr := range sourceRanges {
peers = append(peers, elbv2model.NetworkingPeer{
IPBlock: &elbv2api.IPBlock{
CIDR: cidr,
},
})
}
return peers
}

func (t *defaultModelBuildTask) buildTargetGroupBindingNetworking(ctx context.Context, tgPort intstr.IntOrString, hcPort intstr.IntOrString,
tgProtocol corev1.Protocol, ec2Subnets []*ec2.Subnet) *elbv2model.TargetGroupBindingNetworking {
var from []elbv2model.NetworkingPeer
var fromVPC []elbv2model.NetworkingPeer
kishorj marked this conversation as resolved.
Show resolved Hide resolved
networkingProtocol := elbv2api.NetworkingProtocolTCP
if tgProtocol == corev1.ProtocolUDP {
networkingProtocol = elbv2api.NetworkingProtocolUDP
}
for _, subnet := range ec2Subnets {
from = append(from, elbv2model.NetworkingPeer{
fromVPC = append(fromVPC, elbv2model.NetworkingPeer{
IPBlock: &elbv2api.IPBlock{
CIDR: aws.StringValue(subnet.CidrBlock),
},
})
}
ports := []elbv2api.NetworkingPort{
trafficPorts := []elbv2api.NetworkingPort{
{
Port: &tgPort,
Protocol: &networkingProtocol,
},
}
if hcPort.String() != healthCheckPortTrafficPort && hcPort.IntValue() != tgPort.IntValue() {
networkingProtocolTCP := elbv2api.NetworkingProtocolTCP
ports = append(ports, elbv2api.NetworkingPort{
Port: &hcPort,
Protocol: &networkingProtocolTCP,
})
trafficSource := fromVPC
if networkingProtocol == elbv2api.NetworkingProtocolUDP {
trafficSource = t.buildPeersFromSourceRanges(ctx)
}
tgbNetworking := &elbv2model.TargetGroupBindingNetworking{
Ingress: []elbv2model.NetworkingIngressRule{
{
From: from,
Ports: ports,
From: trafficSource,
Ports: trafficPorts,
},
},
}
if tgProtocol == corev1.ProtocolUDP || hcPort.String() != healthCheckPortTrafficPort && hcPort.IntValue() != tgPort.IntValue() {
kishorj marked this conversation as resolved.
Show resolved Hide resolved
var healthCheckPorts []elbv2api.NetworkingPort
networkingProtocolTCP := elbv2api.NetworkingProtocolTCP
networkingHealthCheckPort := hcPort
if hcPort.String() == healthCheckPortTrafficPort {
networkingHealthCheckPort = tgPort
}
healthCheckPorts = append(healthCheckPorts, elbv2api.NetworkingPort{
Port: &networkingHealthCheckPort,
Protocol: &networkingProtocolTCP,
})
tgbNetworking.Ingress = append(tgbNetworking.Ingress, elbv2model.NetworkingIngressRule{
From: fromVPC,
Ports: healthCheckPorts,
})
}
return tgbNetworking
}

Expand Down
262 changes: 262 additions & 0 deletions pkg/service/nlb/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import (
"context"
"errors"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
elbv2api "sigs.k8s.io/aws-load-balancer-controller/apis/elbv2/v1beta1"
"sigs.k8s.io/aws-load-balancer-controller/pkg/annotations"
"sigs.k8s.io/aws-load-balancer-controller/pkg/deploy"
"sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
Expand Down Expand Up @@ -374,7 +376,23 @@ func Test_defaultModelBuilderTask_buildNLB(t *testing.T) {
{
"protocol":"TCP",
"port":80
}
]
},
{
"from":[
{
"ipBlock":{
"cidr":"172.20.32.0/19"
}
},
{
"ipBlock":{
"cidr":"172.20.64.0/19"
}
}
],
"ports":[
{
"protocol":"TCP",
"port":8888
Expand Down Expand Up @@ -678,7 +696,28 @@ func Test_defaultModelBuilderTask_buildNLB(t *testing.T) {
{
"protocol":"TCP",
"port":8883
}
]
},
{
"from":[
{
"ipBlock":{
"cidr":"10.1.1.1/32"
}
},
{
"ipBlock":{
"cidr":"10.1.1.2/32"
}
},
{
"ipBlock":{
"cidr":"10.1.1.3/32"
}
}
],
"ports":[
{
"protocol":"TCP",
"port":80
Expand Down Expand Up @@ -1118,3 +1157,226 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) {
})
}
}

func Test_defaultModelBuilderTask_buildTargetGroupBindingNetworking(t *testing.T) {
networkingProtocolTCP := elbv2api.NetworkingProtocolTCP
networkingProtocolUDP := elbv2api.NetworkingProtocolUDP
port80 := intstr.FromInt(80)
port808 := intstr.FromInt(808)
trafficPort := intstr.FromString("traffic-port")

tests := []struct {
name string
svc *corev1.Service
tgPort intstr.IntOrString
hcPort intstr.IntOrString
subnets []*ec2.Subnet
tgProtocol corev1.Protocol
want *elbv2.TargetGroupBindingNetworking
}{
{
name: "udp-service with source ranges",
svc: &corev1.Service{
Spec: corev1.ServiceSpec{
LoadBalancerSourceRanges: []string{"10.0.0.0/16", "1.2.3.4/24"},
},
},
tgPort: port80,
hcPort: trafficPort,
subnets: []*ec2.Subnet{{
CidrBlock: aws.String("172.16.0.0/19"),
SubnetId: aws.String("az-1"),
}},
tgProtocol: corev1.ProtocolUDP,
want: &elbv2.TargetGroupBindingNetworking{
Ingress: []elbv2.NetworkingIngressRule{
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "10.0.0.0/16",
},
},
{
IPBlock: &elbv2api.IPBlock{
CIDR: "1.2.3.4/24",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolUDP,
Port: &port80,
},
},
},
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "172.16.0.0/19",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolTCP,
Port: &port80,
},
},
},
},
},
},
{
name: "udp-service with source ranges annotation",
svc: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"service.beta.kubernetes.io/load-balancer-source-ranges": "1.2.3.4/17, 5.6.7.8/18",
},
},
},
tgPort: port80,
hcPort: port808,
subnets: []*ec2.Subnet{{
CidrBlock: aws.String("172.16.0.0/19"),
SubnetId: aws.String("az-1"),
}},
tgProtocol: corev1.ProtocolUDP,
want: &elbv2.TargetGroupBindingNetworking{
Ingress: []elbv2.NetworkingIngressRule{
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "1.2.3.4/17",
},
},
{
IPBlock: &elbv2api.IPBlock{
CIDR: "5.6.7.8/18",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolUDP,
Port: &port80,
},
},
},
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "172.16.0.0/19",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolTCP,
Port: &port808,
},
},
},
},
},
},
{
name: "udp-service with no source ranges configuration",
svc: &corev1.Service{},
tgPort: port80,
hcPort: port808,
subnets: []*ec2.Subnet{{
CidrBlock: aws.String("172.16.0.0/19"),
SubnetId: aws.String("az-1"),
}},
tgProtocol: corev1.ProtocolUDP,
want: &elbv2.TargetGroupBindingNetworking{
Ingress: []elbv2.NetworkingIngressRule{
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "0.0.0.0/0",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolUDP,
Port: &port80,
},
},
},
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "172.16.0.0/19",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolTCP,
Port: &port808,
},
},
},
},
},
},
{
name: "tcp-service with traffic-port hc",
svc: &corev1.Service{},
tgPort: port80,
hcPort: trafficPort,
subnets: []*ec2.Subnet{
{
CidrBlock: aws.String("172.16.0.0/19"),
SubnetId: aws.String("sn-1"),
},
{
CidrBlock: aws.String("1.2.3.4/19"),
SubnetId: aws.String("sn-2"),
},
},
tgProtocol: corev1.ProtocolTCP,
want: &elbv2.TargetGroupBindingNetworking{
Ingress: []elbv2.NetworkingIngressRule{
{
From: []elbv2.NetworkingPeer{
{
IPBlock: &elbv2api.IPBlock{
CIDR: "172.16.0.0/19",
},
},
{
IPBlock: &elbv2api.IPBlock{
CIDR: "1.2.3.4/19",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolTCP,
Port: &port80,
},
},
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
parser := annotations.NewSuffixAnnotationParser("service.beta.kubernetes.io")
builder := &defaultModelBuildTask{service: tt.svc, annotationParser: parser}
got := builder.buildTargetGroupBindingNetworking(context.Background(), tt.tgPort, tt.hcPort, tt.tgProtocol, tt.subnets)
assert.Equal(t, tt.want, got)
})
}
}