Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions pkg/operator/controller/ingress/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ func computeIngressTLSProfile(oldProfile *configv1.TLSProfileSpec, deployment *a
// by looking at the LoadBalancerSourceRanges field and service.beta.kubernetes.io/load-balancer-source-ranges
// annotation of the LoadBalancer-typed Service. The field takes precedence over the annotation.
func computeAllowedSourceRanges(service *corev1.Service) []operatorv1.CIDR {
if service == nil {
return nil
}
cidrs := []operatorv1.CIDR{}
if len(service.Spec.LoadBalancerSourceRanges) > 0 {
for _, r := range service.Spec.LoadBalancerSourceRanges {
Expand Down
74 changes: 74 additions & 0 deletions pkg/operator/controller/ingress/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"encoding/pem"
"k8s.io/utils/pointer"
"math/big"
"reflect"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -2428,3 +2429,76 @@ func TestComputeIngressEvaluationConditionsDetectedCondition(t *testing.T) {
})
}
}

func Test_computeAllowedSourceRanges(t *testing.T) {
tests := []struct {
name string
service *corev1.Service
expect []operatorv1.CIDR
}{
{
name: "service is nil",
service: nil,
expect: nil,
},
{
name: "service doesn't have spec.LoadBalancerSourceRanges",
service: &corev1.Service{
Spec: corev1.ServiceSpec{},
},
expect: nil,
},
{
name: "service has spec.LoadBalancerSourceRanges",
service: &corev1.Service{
Spec: corev1.ServiceSpec{
LoadBalancerSourceRanges: []string{"10.0.0.0/8", "192.128.0.0/16"},
},
},
expect: []operatorv1.CIDR{"10.0.0.0/8", "192.128.0.0/16"},
},
{
name: "service has service.beta.kubernetes.io/load-balancer-source-ranges",
service: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"service.beta.kubernetes.io/load-balancer-source-ranges": "10.0.0.0/8,192.128.0.0/16",
},
},
Spec: corev1.ServiceSpec{},
},
expect: []operatorv1.CIDR{"10.0.0.0/8", "192.128.0.0/16"},
},
{
name: "service has service.beta.kubernetes.io/load-balancer-source-ranges, but it's empty",
service: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"service.beta.kubernetes.io/load-balancer-source-ranges": "",
},
},
},
expect: nil,
},
{
name: "service has service.beta.kubernetes.io/load-balancer-source-ranges and spec.LoadBalancerSourceRanges",
service: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"service.beta.kubernetes.io/load-balancer-source-ranges": "10.0.0.0/8,192.128.0.0/16",
},
},
Spec: corev1.ServiceSpec{
LoadBalancerSourceRanges: []string{"172.0.0.0/8", "210.128.0.0/16"},
},
},
expect: []operatorv1.CIDR{"172.0.0.0/8", "210.128.0.0/16"},
},
}
for _, test := range tests {
actual := computeAllowedSourceRanges(test.service)
if !reflect.DeepEqual(actual, test.expect) {
t.Errorf("%q: expected %v, got %v", test.name, test.expect, actual)
}
}
}