Skip to content

[test] Set replica count based on affinity #307

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
openshift-merge-robot merged 1 commit into from
May 26, 2021
Merged

[test] Set replica count based on affinity #307

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
12 changes: 10 additions & 2 deletions test/e2e/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package e2e
import (
"context"
"fmt"
"log"
"net/http"
"strings"
"testing"
Expand Down Expand Up @@ -199,7 +200,7 @@ func (tc *testContext) getThroughLoadBalancer(webserver *appsv1.Deployment) erro
}
resp, err := retryGET("http://" + locator)
if err != nil {
return fmt.Errorf("could not GET from load balancer: %v", loadBalancer)
return fmt.Errorf("could not GET from load balancer: %v", err)
}
resp.Body.Close()
return nil
Expand All @@ -209,8 +210,10 @@ func (tc *testContext) getThroughLoadBalancer(webserver *appsv1.Deployment) erro
func retryGET(url string) (*http.Response, error) {
var resp *http.Response
var err error
log.Printf("GET %s", url)
for i := 0; i < retryCount*3; i++ {
resp, err = http.Get(url)
log.Printf("%d: %v %v", i, resp, err)
if err == nil && resp.StatusCode == http.StatusOK {
return resp, nil
}
Expand Down Expand Up @@ -359,10 +362,15 @@ func (tc *testContext) getWindowsServerContainerImage() string {
return windowsServerImage
}

// createWindowsServerDeployment creates a deployment with a Windows Server 2019 container
// createWindowsServerDeployment creates a deployment with a Windows Server 2019 container. If affinity is nil then the
// number of replicas will be set to 3 to allow for network testing across nodes.
func (tc *testContext) createWindowsServerDeployment(name string, command []string, affinity *v1.Affinity) (*appsv1.Deployment, error) {
deploymentsClient := tc.client.K8s.AppsV1().Deployments(tc.workloadNamespace)
replicaCount := int32(1)
// affinity being nil is a hint that the caller does not care which nodes the pods are deployed to
if affinity == nil {
replicaCount = int32(3)
}
windowsServerImage := tc.getWindowsServerContainerImage()
containerUserName := "ContainerAdministrator"
deployment := &appsv1.Deployment{
Expand Down