Skip to content

filter redundant health check SG rules #2006

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 1 commit into from
May 14, 2021
Merged

filter redundant health check SG rules #2006

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
68 changes: 46 additions & 22 deletions pkg/service/model_build_target_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@ import (
"crypto/sha256"
"encoding/hex"
"fmt"
"regexp"
"sort"
"strconv"
"strings"

"github.com/aws/aws-sdk-go/aws"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"regexp"
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/k8s"
elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
"sort"
"strconv"
"strings"
)

const (
Expand Down Expand Up @@ -395,9 +396,10 @@ func (t *defaultModelBuildTask) buildTargetGroupBindingSpec(ctx context.Context,
}, nil
}

func (t *defaultModelBuildTask) buildPeersFromSourceRanges(_ context.Context, defaultSourceRanges []string) []elbv2model.NetworkingPeer {
func (t *defaultModelBuildTask) buildPeersFromSourceRanges(_ context.Context, defaultSourceRanges []string) ([]elbv2model.NetworkingPeer, bool) {
var sourceRanges []string
var peers []elbv2model.NetworkingPeer
customSourceRangesConfigured := true
for _, cidr := range t.service.Spec.LoadBalancerSourceRanges {
sourceRanges = append(sourceRanges, cidr)
}
Expand All @@ -406,6 +408,7 @@ func (t *defaultModelBuildTask) buildPeersFromSourceRanges(_ context.Context, de
}
if len(sourceRanges) == 0 {
sourceRanges = defaultSourceRanges
customSourceRangesConfigured = false
}
for _, cidr := range sourceRanges {
peers = append(peers, elbv2model.NetworkingPeer{
Expand All @@ -414,7 +417,7 @@ func (t *defaultModelBuildTask) buildPeersFromSourceRanges(_ context.Context, de
},
})
}
return peers
return peers, customSourceRangesConfigured
}

func (t *defaultModelBuildTask) buildTargetGroupBindingNetworking(ctx context.Context, tgPort intstr.IntOrString, preserveClientIP bool,
Expand All @@ -438,8 +441,9 @@ func (t *defaultModelBuildTask) buildTargetGroupBindingNetworking(ctx context.Co
},
}
trafficSource := fromVPC
customSourceRangesConfigured := false
if networkingProtocol == elbv2api.NetworkingProtocolUDP || preserveClientIP {
trafficSource = t.buildPeersFromSourceRanges(ctx, defaultSourceRanges)
trafficSource, customSourceRangesConfigured = t.buildPeersFromSourceRanges(ctx, defaultSourceRanges)
}
tgbNetworking := &elbv2model.TargetGroupBindingNetworking{
Ingress: []elbv2model.NetworkingIngressRule{
Expand All @@ -449,21 +453,9 @@ func (t *defaultModelBuildTask) buildTargetGroupBindingNetworking(ctx context.Co
},
},
}
if preserveClientIP || tgProtocol == corev1.ProtocolUDP || (hcPort.String() != healthCheckPortTrafficPort && hcPort.IntValue() != tgPort.IntValue()) {
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,
})
if hcIngressRules := t.buildHealthCheckNetworkingIngressRules(trafficSource, fromVPC, tgPort, hcPort, tgProtocol,
preserveClientIP, customSourceRangesConfigured); len(hcIngressRules) > 0 {
tgbNetworking.Ingress = append(tgbNetworking.Ingress, hcIngressRules...)
}
return tgbNetworking
}
Expand All @@ -483,3 +475,35 @@ func (t *defaultModelBuildTask) buildTargetGroupBindingNodeSelector(_ context.Co
MatchLabels: targetNodeLabels,
}, nil
}

func (t *defaultModelBuildTask) buildHealthCheckNetworkingIngressRules(trafficSource, hcSource []elbv2model.NetworkingPeer, tgPort, hcPort intstr.IntOrString,
tgProtocol corev1.Protocol, preserveClientIP, customSoureRanges bool) []elbv2model.NetworkingIngressRule {
if tgProtocol != corev1.ProtocolUDP &&
(hcPort.String() == healthCheckPortTrafficPort || hcPort.IntValue() == tgPort.IntValue()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit:
hcPort.IntValue() == tgPort.IntValue this check is hacky.
If somehow in the future, both hcPort and tgPort is a string but not equal, this will evaluate to true.

ideally we should check hcPort's type.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently health check port is limited to int values. Will revisit this logic when we support named ports as well.

if !preserveClientIP {
return []elbv2model.NetworkingIngressRule{}
}
if !customSoureRanges {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for this version.
however, this becomes really complicated. we should refactor this logic here by some thing like compare CIDRs in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

once we have SG support for NLB, this wouldn't be a matter of concern.

return []elbv2model.NetworkingIngressRule{}
}
for _, src := range trafficSource {
if src.IPBlock.CIDR == "0.0.0.0/0" {
return []elbv2model.NetworkingIngressRule{}
}
}
}
var healthCheckPorts []elbv2api.NetworkingPort
networkingProtocolTCP := elbv2api.NetworkingProtocolTCP
networkingHealthCheckPort := hcPort
if hcPort.String() == healthCheckPortTrafficPort {
networkingHealthCheckPort = tgPort
}
healthCheckPorts = append(healthCheckPorts, elbv2api.NetworkingPort{
Port: &networkingHealthCheckPort,
Protocol: &networkingProtocolTCP,
})
return []elbv2model.NetworkingIngressRule{{
From: hcSource,
Ports: healthCheckPorts,
}}
}
71 changes: 51 additions & 20 deletions pkg/service/model_build_target_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,26 +624,6 @@ func Test_defaultModelBuilderTask_buildTargetGroupBindingNetworking(t *testing.T
},
},
},
{
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,
},
},
},
},
},
},
Expand Down Expand Up @@ -837,6 +817,57 @@ func Test_defaultModelBuilderTask_buildTargetGroupBindingNetworking(t *testing.T
},
},
},
{
name: "tcp-service with preserve Client IP, hc is traffic port, source range specified and contains 0/0",
svc: &corev1.Service{
Spec: corev1.ServiceSpec{
LoadBalancerSourceRanges: []string{"10.0.0.0/16", "1.2.3.4/24", "0.0.0.0/0"},
},
},
tgPort: port80,
hcPort: port80,
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,
preserveClientIP: true,
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",
},
},
{
IPBlock: &elbv2api.IPBlock{
CIDR: "0.0.0.0/0",
},
},
},
Ports: []elbv2api.NetworkingPort{
{
Protocol: &networkingProtocolTCP,
Port: &port80,
},
},
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
65 changes: 0 additions & 65 deletions pkg/service/model_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,31 +1265,6 @@ func Test_defaultModelBuilderTask_Build(t *testing.T) {
"port":31223
}
]
},
{
"from":[
{
"ipBlock":{
"cidr":"192.168.0.0/19"
}
},
{
"ipBlock":{
"cidr":"192.168.32.0/19"
}
},
{
"ipBlock":{
"cidr":"192.168.64.0/19"
}
}
],
"ports":[
{
"protocol":"TCP",
"port":31223
}
]
}
]
}
Expand Down Expand Up @@ -1330,31 +1305,6 @@ func Test_defaultModelBuilderTask_Build(t *testing.T) {
"port":32323
}
]
},
{
"from":[
{
"ipBlock":{
"cidr":"192.168.0.0/19"
}
},
{
"ipBlock":{
"cidr":"192.168.32.0/19"
}
},
{
"ipBlock":{
"cidr":"192.168.64.0/19"
}
}
],
"ports":[
{
"protocol":"TCP",
"port":32323
}
]
}
]
}
Expand Down Expand Up @@ -1974,21 +1924,6 @@ func Test_defaultModelBuilderTask_Build(t *testing.T) {
"port": 80
}
]
},
{
"from": [
{
"ipBlock": {
"cidr": "192.168.0.0/19"
}
}
],
"ports": [
{
"protocol": "TCP",
"port": 80
}
]
}
]
},
Expand Down