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

NEG: Add wrappers for NEG Windows test. #1904

Merged
merged 1 commit into from
Jan 27, 2023
Merged

NEG: Add wrappers for NEG Windows test. #1904

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
34 changes: 29 additions & 5 deletions cmd/e2e-test/neg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ import (
)

func TestNEG(t *testing.T) {
testNEGOS(t, e2e.Linux)
}

func TestWindowsNEG(t *testing.T) {
testNEGOS(t, e2e.Windows)
}

func testNEGOS(t *testing.T, os e2e.OS) {
t.Parallel()
const (
numForwardingRules = 1
Expand Down Expand Up @@ -94,8 +102,8 @@ func TestNEG(t *testing.T) {
ctx := context.Background()

for name, attr := range tc.services {
_, err := e2e.EnsureEchoService(s, name, map[string]string{
annotations.NEGAnnotationKey: attr.annotations.String()}, attr.svcType, replicas)
_, err := e2e.EnsureEchoServiceOS(s, name, map[string]string{
annotations.NEGAnnotationKey: attr.annotations.String()}, attr.svcType, replicas, os)
if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
}
Expand Down Expand Up @@ -138,6 +146,14 @@ func TestNEG(t *testing.T) {
}

func TestNEGTransition(t *testing.T) {
testNEGTransitionOS(t, e2e.Linux)
}

func TestWindowsNEGTransition(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

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

naive question, how do you skip this test if there are no windows nodes?

or is ok to fail in that case?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is okay to fail in that case.

testNEGTransitionOS(t, e2e.Windows)
}

func testNEGTransitionOS(t *testing.T, os e2e.OS) {
t.Parallel()

port80 := networkingv1.ServiceBackendPort{Number: 80}
Expand Down Expand Up @@ -185,7 +201,7 @@ func TestNEGTransition(t *testing.T) {
svcAnnotations[annotations.NEGAnnotationKey] = tc.annotations.String()
}
// First create the echo service, we will be adapting it throughout the basic tests
_, err := e2e.EnsureEchoService(s, "service-1", svcAnnotations, v1.ServiceTypeNodePort, 1)
_, err := e2e.EnsureEchoServiceOS(s, "service-1", svcAnnotations, v1.ServiceTypeNodePort, 1, os)

if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
Expand Down Expand Up @@ -237,6 +253,14 @@ func TestNEGTransition(t *testing.T) {
}

func TestNEGSyncEndpoints(t *testing.T) {
testNEGSyncEndpoints(t, e2e.Linux)
}

func TestWindowsNEGSyncEndpoints(t *testing.T) {
testNEGSyncEndpoints(t, e2e.Windows)
}

func testNEGSyncEndpoints(t *testing.T, os e2e.OS) {
t.Parallel()

port80 := networkingv1.ServiceBackendPort{Number: 80}
Expand Down Expand Up @@ -288,7 +312,7 @@ func TestNEGSyncEndpoints(t *testing.T) {
ctx := context.Background()

svcAnnotations := map[string]string{annotations.NEGAnnotationKey: tc.annotations.String()}
_, err := e2e.EnsureEchoService(s, svcName, svcAnnotations, v1.ServiceTypeClusterIP, 0)
_, err := e2e.EnsureEchoServiceOS(s, svcName, svcAnnotations, v1.ServiceTypeClusterIP, 0, os)

if err != nil {
t.Fatalf("error ensuring echo service: %v", err)
Expand All @@ -306,7 +330,7 @@ func TestNEGSyncEndpoints(t *testing.T) {
// However, the anti affinity rule may not fully solve this problem in the case where there
// is no capacity left in all nodes in a zone. Hence, it may still cause all pods to be scheduled into
// other zones. A pod started later may get scheduled to a zone when capacity freed up.
if err := e2e.EnsureEchoDeployment(s, svcName, replicas, e2e.SpreadPodAcrossZones); err != nil {
if err := e2e.EnsureEchoDeploymentOS(s, svcName, replicas, e2e.SpreadPodAcrossZones, os); err != nil {
t.Fatalf("error ensuring echo deployment: %v", err)
}

Expand Down
11 changes: 11 additions & 0 deletions pkg/e2e/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ func CreateEchoServiceWithOS(s *Sandbox, name string, annotations map[string]str
return ensureEchoService(s, name, annotations, v1.ServiceTypeNodePort, 1, os)
}

// EnsureEchoServiceOS ensures that the Echo service with the given description is set up for Linux or Windows OS.
func EnsureEchoServiceOS(s *Sandbox, name string, annotations map[string]string, svcType v1.ServiceType, numReplicas int32, os OS) (*v1.Service, error) {
return ensureEchoService(s, name, annotations, svcType, numReplicas, os)
}

// EnsureEchoService that the Echo service with the given description is set up
func EnsureEchoService(s *Sandbox, name string, annotations map[string]string, svcType v1.ServiceType, numReplicas int32) (*v1.Service, error) {
return ensureEchoService(s, name, annotations, svcType, numReplicas, Linux)
Expand Down Expand Up @@ -164,6 +169,11 @@ func DeleteService(s *Sandbox, svcName string) error {
return s.f.Clientset.CoreV1().Services(s.Namespace).Delete(context.TODO(), svcName, metav1.DeleteOptions{})
}

// EnsureEchoDeploymentOS ensures that the Echo deployment with the given description is set up for Linux or Windows OS.
func EnsureEchoDeploymentOS(s *Sandbox, name string, numReplicas int32, modify func(deployment *apps.Deployment), os OS) error {
return ensureEchoDeployment(s, name, numReplicas, modify, os)
}

// EnsureEchoDeployment ensures that the Echo deployment with the given description is set up
func EnsureEchoDeployment(s *Sandbox, name string, numReplicas int32, modify func(deployment *apps.Deployment)) error {
return ensureEchoDeployment(s, name, numReplicas, modify, Linux)
Expand All @@ -172,6 +182,7 @@ func EnsureEchoDeployment(s *Sandbox, name string, numReplicas int32, modify fun
func ensureEchoDeployment(s *Sandbox, name string, numReplicas int32, modify func(deployment *apps.Deployment), os OS) error {
image := echoheadersImage
var nodeSelector map[string]string
nodeSelector = map[string]string{"kubernetes.io/os": "linux"}
if os == Windows {
image = echoheadersImageWindows
nodeSelector = map[string]string{"kubernetes.io/os": "windows"}
Expand Down