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
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
check-latest: true
id: go

- name: Install CI
- name: Install Dependencies
run: |
go get -v -t -d ./...

Expand All @@ -45,6 +45,9 @@ jobs:
if: github.actor == 'nektos/act' && matrix.os == 'ubuntu-latest'

- name: Test
env:
GOMAXPROCS: 1
GOMEMLIMIT: 2048MiB
run: make test

- name: Send coverage
Expand Down
70 changes: 36 additions & 34 deletions source/istio_gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package source
import (
"context"
"errors"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand All @@ -30,6 +31,7 @@ import (
v1 "k8s.io/api/core/v1"
networkv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/fake"

"sigs.k8s.io/external-dns/endpoint"
Expand Down Expand Up @@ -1523,25 +1525,6 @@ func testGatewayEndpoints(t *testing.T) {
}

func TestGatewaySource_GWSelectorMatchServiceSelector(t *testing.T) {
svc := &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "fake-service",
Namespace: "default",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"app": "demo",
"env": "prod",
"team": "devops",
"version": "v1",
"release": "stable",
"track": "daily",
"tier": "backend",
},
ExternalIPs: []string{"10.10.10.255"},
},
}

tests := []struct {
name string
selectors map[string]string
Expand Down Expand Up @@ -1585,25 +1568,31 @@ func TestGatewaySource_GWSelectorMatchServiceSelector(t *testing.T) {
},
}

for _, tt := range tests {
for i, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
fakeKubeClient := fake.NewClientset()
fakeIstioClient := istiofake.NewSimpleClientset()

src, err := NewIstioGatewaySource(
t.Context(),
fakeKubeClient,
fakeIstioClient,
"",
"",
"",
false,
false,
)
require.NoError(t, err)
require.NotNil(t, src)

_, err = fakeKubeClient.CoreV1().Services(svc.Namespace).Create(t.Context(), svc, metav1.CreateOptions{})
svc := &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "fake-service",
Namespace: "default",
UID: types.UID(fmt.Sprintf("fake-service-uid-%d", i)),
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"app": "demo",
"env": "prod",
"team": "devops",
"version": "v1",
"release": "stable",
"track": "daily",
"tier": "backend",
},
ExternalIPs: []string{"10.10.10.255"},
},
}
_, err := fakeKubeClient.CoreV1().Services(svc.Namespace).Create(t.Context(), svc, metav1.CreateOptions{})
require.NoError(t, err)

gw := &networkingv1beta1.Gateway{
Expand All @@ -1624,6 +1613,19 @@ func TestGatewaySource_GWSelectorMatchServiceSelector(t *testing.T) {
_, err = fakeIstioClient.NetworkingV1beta1().Gateways(gw.Namespace).Create(context.Background(), gw, metav1.CreateOptions{})
require.NoError(t, err)

src, err := NewIstioGatewaySource(
t.Context(),
fakeKubeClient,
fakeIstioClient,
"",
"",
"",
false,
false,
)
require.NoError(t, err)
require.NotNil(t, src)

res, err := src.Endpoints(t.Context())
require.NoError(t, err)

Expand Down
83 changes: 43 additions & 40 deletions source/istio_virtualservice_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package source
import (
"context"
"errors"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand All @@ -31,6 +32,7 @@ import (
v1 "k8s.io/api/core/v1"
networkv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/fake"

"sigs.k8s.io/external-dns/endpoint"
Expand All @@ -49,7 +51,7 @@ type VirtualServiceSuite struct {
}

func (suite *VirtualServiceSuite) SetupTest() {
fakeKubernetesClient := fake.NewSimpleClientset()
fakeKubernetesClient := fake.NewClientset()
fakeIstioClient := istiofake.NewSimpleClientset()
var err error

Expand Down Expand Up @@ -189,7 +191,7 @@ func TestNewIstioVirtualServiceSource(t *testing.T) {

_, err := NewIstioVirtualServiceSource(
context.TODO(),
fake.NewSimpleClientset(),
fake.NewClientset(),
istiofake.NewSimpleClientset(),
"",
ti.annotationFilter,
Expand Down Expand Up @@ -2213,26 +2215,7 @@ func TestVirtualServiceSourceGetGateway(t *testing.T) {
}
}

func TestGatewaySource_GWVServiceSelectorMatchServiceSelector(t *testing.T) {
svc := &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "fake-service",
Namespace: "default",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"app": "demo",
"env": "prod",
"team": "devops",
"version": "v1",
"release": "stable",
"track": "daily",
"tier": "backend",
},
ExternalIPs: []string{"10.10.10.255"},
},
}

func TestIstioVirtualServiceSource_GWServiceSelectorMatchServiceSelector(t *testing.T) {
tests := []struct {
name string
selectors map[string]string
Expand All @@ -2244,7 +2227,7 @@ func TestGatewaySource_GWVServiceSelectorMatchServiceSelector(t *testing.T) {
"version": "v1",
},
expected: []*endpoint.Endpoint{
endpoint.NewEndpoint("example.org", endpoint.RecordTypeA, "10.10.10.255").WithLabel("resource", "gateway/default/fake-gateway"),
endpoint.NewEndpoint("example.org", endpoint.RecordTypeA, "10.10.10.255").WithLabel("resource", "virtualservice/default/fake-vservice"),
},
},
{
Expand All @@ -2259,7 +2242,7 @@ func TestGatewaySource_GWVServiceSelectorMatchServiceSelector(t *testing.T) {
"tier": "backend",
},
expected: []*endpoint.Endpoint{
endpoint.NewEndpoint("example.org", endpoint.RecordTypeA, "10.10.10.255").WithLabel("resource", "gateway/default/fake-gateway"),
endpoint.NewEndpoint("example.org", endpoint.RecordTypeA, "10.10.10.255").WithLabel("resource", "virtualservice/default/fake-vservice"),
},
},
{
Expand All @@ -2271,29 +2254,36 @@ func TestGatewaySource_GWVServiceSelectorMatchServiceSelector(t *testing.T) {
"app": "demo",
},
expected: []*endpoint.Endpoint{
endpoint.NewEndpoint("example.org", endpoint.RecordTypeA, "10.10.10.255").WithLabel("resource", "gateway/default/fake-gateway"),
endpoint.NewEndpoint("example.org", endpoint.RecordTypeA, "10.10.10.255").WithLabel("resource", "virtualservice/default/fake-vservice"),
},
},
}
for _, tt := range tests {
for i, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
fakeKubeClient := fake.NewClientset()
fakeIstioClient := istiofake.NewSimpleClientset()

src, err := NewIstioGatewaySource(
t.Context(),
fakeKubeClient,
fakeIstioClient,
"",
"",
"",
false,
false,
)
require.NoError(t, err)
require.NotNil(t, src)
svc := &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "fake-service",
Namespace: "default",
UID: types.UID(fmt.Sprintf("fake-service-uid-%d", i)),
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"app": "demo",
"env": "prod",
"team": "devops",
"version": "v1",
"release": "stable",
"track": "daily",
"tier": "backend",
},
ExternalIPs: []string{"10.10.10.255"},
},
}

_, err = fakeKubeClient.CoreV1().Services(svc.Namespace).Create(context.Background(), svc, metav1.CreateOptions{})
_, err := fakeKubeClient.CoreV1().Services(svc.Namespace).Create(context.Background(), svc, metav1.CreateOptions{})
require.NoError(t, err)

gw := &networkingv1beta1.Gateway{
Expand All @@ -2315,7 +2305,7 @@ func TestGatewaySource_GWVServiceSelectorMatchServiceSelector(t *testing.T) {
require.NoError(t, err)

gwService := &networkingv1beta1.VirtualService{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"},
ObjectMeta: metav1.ObjectMeta{Name: "fake-vservice", Namespace: "default"},
Spec: istionetworking.VirtualService{
Gateways: []string{gw.Namespace + "/" + gw.Name},
Hosts: []string{"example.org"},
Expand All @@ -2325,6 +2315,19 @@ func TestGatewaySource_GWVServiceSelectorMatchServiceSelector(t *testing.T) {
_, err = fakeIstioClient.NetworkingV1beta1().VirtualServices(gwService.Namespace).Create(t.Context(), gwService, metav1.CreateOptions{})
require.NoError(t, err)

src, err := NewIstioVirtualServiceSource(
t.Context(),
fakeKubeClient,
fakeIstioClient,
"",
"",
"",
false,
false,
)
require.NoError(t, err)
require.NotNil(t, src)

res, err := src.Endpoints(t.Context())
require.NoError(t, err)

Expand Down
Loading