BUG/MINOR: e2e: use correct configmap.yaml file

with removing of default service with 38c1e14 file changed prefix from 3 to 2
haproxytech · Sep 13, 2022 · 7b1878a · 7b1878a
1 parent 4194cf1
commit 7b1878a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/deploy/tests/e2e/config-snippet/suite_test.go b/deploy/tests/e2e/config-snippet/suite_test.go
@@ -53,7 +53,7 @@ func (suite *ConfigSnippetSuite) SetupSuite() {
 		return res.StatusCode == 200
 	}, e2e.WaitDuration, e2e.TickDuration)
 	suite.test.AddTearDown(func() error {
-		return suite.test.Apply("../../config/3.configmap.yaml", "", nil)
+		return suite.test.Apply("../../config/2.configmap.yaml", "", nil)
 	})
 }
 

diff --git a/deploy/tests/e2e/cors/cors_test.go b/deploy/tests/e2e/cors/cors_test.go
@@ -46,7 +46,7 @@ func (suite *CorsSuite) Test_Configmap_Alone() {
 	suite.Run("CorsMethodsCredentialAlone", suite.CorsMethodsCredentialAlone(false))
 	suite.Run("CorsDisable", suite.CorsDisable(false))
 	suite.Run("CorsMethodsCredentialDisable", suite.CorsMethodsCredentialDisable(false))
-	suite.NoError(suite.test.Apply("../../config/3.configmap.yaml", "", nil))
+	suite.NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
 }
 
 func (suite *CorsSuite) Test_Ingress_Alone() {
@@ -121,6 +121,7 @@ func (suite *CorsSuite) Default(ingressCors bool) func() {
 		suite.eventuallyReturns(expectedHeaders, unexpectedHeaders)
 	}
 }
+
 func (suite *CorsSuite) CorsOriginAlone(ingressCors bool) func() {
 	return func() {
 		expectedHeaders := http.Header{

diff --git a/deploy/tests/e2e/cors/suite_test.go b/deploy/tests/e2e/cors/suite_test.go
@@ -45,12 +45,12 @@ func (suite *CorsSuite) SetupSuite() {
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
 
-	suite.NoError(suite.test.Apply("../../config/3.configmap.yaml", "", nil))
+	suite.NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
 	suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), tmplData{Host: suite.test.GetNS() + ".test"}))
 }
 
 func (suite *CorsSuite) TearDownSuite() {
-	//suite.test.Apply("../../config/3.configmap.yaml", "", nil)
+	// suite.test.Apply("../../config/2.configmap.yaml", "", nil)
 	suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), tmplData{Host: suite.test.GetNS() + ".test"}))
 	suite.test.TearDown()
 }

diff --git a/deploy/tests/e2e/global-config/maxconn_test.go b/deploy/tests/e2e/global-config/maxconn_test.go
@@ -25,7 +25,7 @@ func (suite *GlobalConfigSuite) TestMaxconn() {
 	suite.maxconn = "1111"
 	suite.Eventually(suite.checkMaxconn, e2e.WaitDuration, e2e.TickDuration)
 
-	suite.NoError(suite.test.Apply("../../config/3.configmap.yaml", "", nil))
+	suite.NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
 	suite.maxconn = "1000"
 	suite.Eventually(suite.checkMaxconn, e2e.WaitDuration, e2e.TickDuration)
 }

diff --git a/deploy/tests/e2e/global-config/proxy_protocol.go b/deploy/tests/e2e/global-config/proxy_protocol.go
@@ -49,5 +49,5 @@ func (suite *GlobalConfigSuite) Test_Proxy_Protocol() {
 	})
 
 	// revert to initial configmap
-	suite.NoError(suite.test.Apply("../../config/3.configmap.yaml", "", nil))
+	suite.NoError(suite.test.Apply("../../config/2.configmap.yaml", "", nil))
 }
diff --git a/deploy/tests/e2e/tls-auth/suite_test.go b/deploy/tests/e2e/tls-auth/suite_test.go
@@ -57,7 +57,7 @@ func (suite *TLSAuthSuite) SetupSuite() {
 	}, e2e.WaitDuration, e2e.TickDuration)
 	suite.Require().NoError(suite.test.Apply("config/secrets/client-ca.yaml", suite.test.GetNS(), nil))
 	suite.test.AddTearDown(func() error {
-		return suite.test.Apply("../../config/3.configmap.yaml", "", nil)
+		return suite.test.Apply("../../config/2.configmap.yaml", "", nil)
 	})
 }