DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use functional options to reduce number of methods creating an EchoDeployment (#8199)

Browse source
This commit is contained in:
Damien Mathieu 2022-02-02 14:12:22 +01:00 • committed by GitHub
parent 0f464333a9
commit dcd552ceb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 75 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/e2e/annotations/canary.go
View file

@ -39,10 +39,10 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
ginkgo.BeforeEach(func() {
// Deployment for main backend
f.NewEchoDeploymentWithReplicas(1)
f.NewEchoDeployment()
// Deployment for canary backend
f.NewEchoDeploymentWithNameAndReplicas(canaryService, 1)
f.NewEchoDeployment(framework.WithDeploymentName(canaryService))
})
ginkgo.Context("when canary is created", func() {
@ -132,7 +132,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
ginkgo.By("returning a 503 status when the mainline deployment has 0 replicas and a request is sent to the canary")
f.NewEchoDeploymentWithReplicas(0)
f.NewEchoDeployment(framework.WithDeploymentReplicas(0))
resp, _, errs := gorequest.New().
Get(f.GetURL(framework.HTTP)).
@ -145,7 +145,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
ginkgo.By("returning a 200 status when the canary deployment has 0 replicas and a request is sent to the mainline ingress")
f.NewEchoDeploymentWithReplicas(1)
f.NewEchoDeployment()
f.NewDeployment(canaryService, "k8s.gcr.io/e2e-test-images/echoserver:2.3", 8080, 0)
resp, _, errs = gorequest.New().