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

Add e2e tests for neg naming and neg crd #1207

Merged
merged 1 commit into from
Aug 6, 2020
Merged

Add e2e tests for neg naming and neg crd #1207

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
167 changes: 167 additions & 0 deletions cmd/e2e-test/neg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package main

import (
"context"
"fmt"
"testing"

apps "k8s.io/api/apps/v1"
Expand Down Expand Up @@ -386,3 +387,169 @@ func TestReadinessReflector(t *testing.T) {
}
})
}

func TestNegCRDTransitions(t *testing.T) {
t.Parallel()
port80 := intstr.FromInt(80)
port443 := intstr.FromInt(443)
serviceName := "neg-service"
ctx := context.Background()

Framework.RunWithSandbox("NEGs with custom names", t, func(t *testing.T, s *e2e.Sandbox) {
var previousNegStatus annotations.NegStatus
expectedNEGName := fmt.Sprintf("test-neg-name-%x", s.RandInt)

for _, tc := range []struct {
desc string
annotations annotations.NegAnnotation
replicas int32
expectedNegAttrs map[string]string
expectedGCNegPorts []string
}{
{desc: "one NEG with custom name, one neg with generated name",
annotations: annotations.NegAnnotation{
Ingress: false,
ExposedPorts: map[int32]annotations.NegAttributes{
int32(port80.IntValue()): annotations.NegAttributes{Name: expectedNEGName},
int32(port443.IntValue()): annotations.NegAttributes{},
}},
replicas: 2,
expectedNegAttrs: map[string]string{port80.String(): expectedNEGName, port443.String(): ""},
},
{desc: "remove custom name",
annotations: annotations.NegAnnotation{
Ingress: false,
ExposedPorts: map[int32]annotations.NegAttributes{
int32(port80.IntValue()): annotations.NegAttributes{},
int32(port443.IntValue()): annotations.NegAttributes{},
}},
replicas: 2,
expectedNegAttrs: map[string]string{port80.String(): "", port443.String(): ""},
expectedGCNegPorts: []string{port80.String()},
},
{desc: "add custom name",
annotations: annotations.NegAnnotation{
Ingress: false,
ExposedPorts: map[int32]annotations.NegAttributes{
int32(port80.IntValue()): annotations.NegAttributes{},
int32(port443.IntValue()): annotations.NegAttributes{Name: expectedNEGName},
}},
replicas: 2,
expectedNegAttrs: map[string]string{port80.String(): "", port443.String(): expectedNEGName},
expectedGCNegPorts: []string{port443.String()},
},
{desc: "no NEGs",
annotations: annotations.NegAnnotation{
Ingress: false,
ExposedPorts: map[int32]annotations.NegAttributes{}},
replicas: 2,
expectedGCNegPorts: []string{port80.String(), port443.String()},
},
} {
_, err := e2e.EnsureEchoService(s, serviceName, map[string]string{
annotations.NEGAnnotationKey: tc.annotations.String()}, v1.ServiceTypeClusterIP, tc.replicas)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}
t.Logf("Echo service ensured (%s/%s)", s.Namespace, serviceName)

if len(tc.expectedGCNegPorts) > 0 {
for _, port := range tc.expectedGCNegPorts {
if err = e2e.WaitForStandaloneNegDeletion(ctx, s.ValidatorEnv.Cloud(), s, port, previousNegStatus); err != nil {
t.Errorf("Error waiting for NEGDeletion: %v", err)
}
}
}

negStatus, err := e2e.WaitForNegCRs(s, serviceName, tc.expectedNegAttrs)
if err != nil {
t.Fatalf("Error: e2e.WaitForNegCRs(%s,%+v) = %s, want nil", serviceName, tc.expectedNegAttrs, err)
}

for port, negName := range negStatus.NetworkEndpointGroups {
err := e2e.WaitForNegs(ctx, Framework.Cloud, negName, negStatus.Zones, false, int(tc.replicas))
if err != nil {
t.Fatalf("Error: e2e.WaitForNegs service %s/%s neg port/name %s/%s", serviceName, s.Namespace, port, negName)
}
}
previousNegStatus = negStatus
}
})
}

func TestNegCRDErrorEvents(t *testing.T) {
t.Parallel()
port80 := intstr.FromInt(80)
svc1 := "svc1"
svc2 := "svc2"
replicas := int32(2)
ctx := context.Background()

Framework.RunWithSandbox("two services, same neg name", t, func(t *testing.T, s *e2e.Sandbox) {
expectedNEGName := fmt.Sprintf("test-neg-name-%x", s.RandInt)
annotation := annotations.NegAnnotation{
Ingress: true,
ExposedPorts: map[int32]annotations.NegAttributes{
int32(port80.IntValue()): annotations.NegAttributes{Name: expectedNEGName},
},
}

_, err := e2e.EnsureEchoService(s, svc1, map[string]string{
annotations.NEGAnnotationKey: annotation.String()}, v1.ServiceTypeClusterIP, replicas)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}

// Ingress true with a custom name should cause an event
if err = e2e.WaitForSvcNegErrorEvents(s, svc1, 1); err != nil {
t.Errorf("error waiting for error events: %s", err)
}

// Ensure service with ingress true and wait for neg to be created
annotation.Ingress = false
_, err = e2e.EnsureEchoService(s, svc1, map[string]string{
annotations.NEGAnnotationKey: annotation.String()}, v1.ServiceTypeClusterIP, replicas)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}
t.Logf("Echo service ensured (%s/%s)", s.Namespace, svc1)

expectedNegAttrs := map[string]string{port80.String(): expectedNEGName}
negStatus, err := e2e.WaitForNegCRs(s, svc1, expectedNegAttrs)
if err != nil {
t.Fatalf("Error: e2e.WaitForNegCRs(%s,%+v) = %s, want nil", svc1, expectedNegAttrs, err)
}

for port, negName := range negStatus.NetworkEndpointGroups {
err := e2e.WaitForNegs(ctx, Framework.Cloud, negName, negStatus.Zones, false, int(replicas))
if err != nil {
t.Fatalf("Error: e2e.WaitForNegs service %s/%s neg port/name %s/%s", svc1, s.Namespace, port, negName)
}
}

// Ensure a second service requesting the same neg name
_, err = e2e.EnsureEchoService(s, svc2, map[string]string{
annotations.NEGAnnotationKey: annotation.String()}, v1.ServiceTypeClusterIP, replicas)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}

// Requesting the same neg name should cause an error event on the second service
if err = e2e.WaitForSvcNegErrorEvents(s, svc2, 1); err != nil {
t.Errorf("error waiting for error events: %s", err)
}

// GC existing negs
_, err = e2e.EnsureEchoService(s, svc1, map[string]string{}, v1.ServiceTypeClusterIP, replicas)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}

_, err = e2e.EnsureEchoService(s, svc2, map[string]string{}, v1.ServiceTypeClusterIP, replicas)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}

e2e.WaitForStandaloneNegDeletion(ctx, Framework.Cloud, s, port80.String(), negStatus)
})
}
15 changes: 13 additions & 2 deletions pkg/e2e/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
"k8s.io/client-go/rest"
backendconfigclient "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned"
frontendconfigclient "k8s.io/ingress-gce/pkg/frontendconfig/client/clientset/versioned"
svcnegclient "k8s.io/ingress-gce/pkg/svcneg/client/clientset/versioned"
"k8s.io/klog"
)

Expand Down Expand Up @@ -76,7 +77,12 @@ func NewFramework(config *rest.Config, options Options) *Framework {

frontendConfigClient, err := frontendconfigclient.NewForConfig(config)
if err != nil {
klog.Fatalf("Failed to create BackendConfig client: %v", err)
klog.Fatalf("Failed to create FrontendConfig client: %v", err)
}

svcNegClient, err := svcnegclient.NewForConfig(config)
if err != nil {
klog.Fatalf("Failed to create SvcNeg client: %v", err)
}

f := &Framework{
Expand All @@ -85,6 +91,7 @@ func NewFramework(config *rest.Config, options Options) *Framework {
crdClient: apiextensionsclient.NewForConfigOrDie(config),
FrontendConfigClient: frontendConfigClient,
BackendConfigClient: backendConfigClient,
SvcNegClient: svcNegClient,
Project: options.Project,
Region: options.Region,
Network: options.Network,
Expand Down Expand Up @@ -127,6 +134,7 @@ type Framework struct {
crdClient *apiextensionsclient.Clientset
BackendConfigClient *backendconfigclient.Clientset
FrontendConfigClient *frontendconfigclient.Clientset
SvcNegClient *svcnegclient.Clientset
Project string
Region string
Network string
Expand Down Expand Up @@ -243,9 +251,12 @@ func (f *Framework) WithSandbox(testFunc func(*Sandbox) error) error {
func (f *Framework) RunWithSandbox(name string, t *testing.T, testFunc func(*testing.T, *Sandbox)) {
t.Run(name, func(t *testing.T) {
f.lock.Lock()
randInt := f.Rand.Int63()
sandbox := &Sandbox{
Namespace: fmt.Sprintf("test-sandbox-%x", f.Rand.Int63()),

Namespace: fmt.Sprintf("test-sandbox-%x", randInt),
f: f,
RandInt: randInt,
}
for _, s := range f.sandboxes {
if s.Namespace == sandbox.Namespace {
Expand Down
Loading