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

2
test/e2e/settings/default_ssl_certificate.go
View file

@ -38,7 +38,7 @@ var _ = framework.IngressNginxDescribe("[SSL] [Flag] default-ssl-certificate", f
port := 80
ginkgo.BeforeEach(func() {
f.NewEchoDeploymentWithReplicas(1)
f.NewEchoDeployment(framework.WithDeploymentReplicas(1))
var err error
tlsConfig, err = framework.CreateIngressTLSSecret(f.KubeClientSet,

2
test/e2e/settings/disable_catch_all.go
View file

@ -34,7 +34,7 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-catch-all", func() {
f := framework.NewDefaultFramework("disabled-catch-all")
ginkgo.BeforeEach(func() {
f.NewEchoDeploymentWithReplicas(1)
f.NewEchoDeployment(framework.WithDeploymentReplicas(1))
err := f.UpdateIngressControllerDeployment(func(deployment *appsv1.Deployment) error {
args := deployment.Spec.Template.Spec.Containers[0].Args

2
test/e2e/settings/disable_service_external_name.go
View file

@ -35,7 +35,7 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-service-external-name", f
f := framework.NewDefaultFramework("disabled-service-external-name")
ginkgo.BeforeEach(func() {
f.NewEchoDeploymentWithReplicas(2)
f.NewEchoDeployment(framework.WithDeploymentReplicas(2))
err := f.UpdateIngressControllerDeployment(func(deployment *appsv1.Deployment) error {
args := deployment.Spec.Template.Spec.Containers[0].Args

2
test/e2e/settings/ingress_class.go
View file

@ -45,7 +45,7 @@ var _ = framework.IngressNginxDescribe("[Flag] ingress-class", func() {
otherController := "k8s.io/other-class"
ginkgo.BeforeEach(func() {
f.NewEchoDeploymentWithReplicas(1)
f.NewEchoDeployment(framework.WithDeploymentReplicas(1))
doOnce.Do(func() {
_, err := f.KubeClientSet.NetworkingV1().IngressClasses().

2
test/e2e/settings/namespace_selector.go
View file

@ -37,7 +37,7 @@ var _ = framework.IngressNginxDescribe("[Flag] watch namespace selector", func()
prepareTestIngress := func(baseName string, host string, labels map[string]string) string {
ns, err := framework.CreateKubeNamespaceWithLabel(f.BaseName, labels, f.KubeClientSet)
assert.Nil(ginkgo.GinkgoT(), err, "creating test namespace")
f.NewEchoDeploymentWithNamespaceAndReplicas(ns, 1)
f.NewEchoDeployment(framework.WithDeploymentNamespace(ns))
ing := framework.NewSingleIngressWithIngressClass(host, "/", host, ns, framework.EchoService, f.IngressClass, 80, nil)
f.EnsureIngress(ing)
return ns