TEST: e2e: merge DeployYamlTemplate and DeployYalm methods into

Mo3m3n · Mo3m3n · commit b2290f9d38af · 2021-12-01T05:22:57.000+01:00
Apply
diff --git a/deploy/tests/e2e/basic-auth/basic_auth_test.go b/deploy/tests/e2e/basic-auth/basic_auth_test.go
@@ -24,7 +24,7 @@ import (
 
 func (suite *HTTPBasicAuthSuite) Test_BasicAuth() {
 	suite.Run("Denied", func() {
-		suite.NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Require().Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if res == nil {
diff --git a/deploy/tests/e2e/canary-deployment/percentage_test.go b/deploy/tests/e2e/canary-deployment/percentage_test.go
@@ -28,7 +28,7 @@ func (suite *CanaryDeploymentSuite) Test_Response_Percentage() {
 	for _, percentage := range []int{0, 25, 100} {
 		suite.Run(fmt.Sprintf("%d", percentage), func() {
 			suite.tmplData.StagingRouteACL = fmt.Sprintf("rand(100) lt %d", percentage)
-			suite.NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+			suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 			suite.Eventually(func() bool {
 				counter := 0
 				for i := 0; i < 10; i++ {
diff --git a/deploy/tests/e2e/canary-deployment/suite_test.go b/deploy/tests/e2e/canary-deployment/suite_test.go
@@ -48,7 +48,7 @@ func (suite *CanaryDeploymentSuite) SetupSuite() {
 	}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
-	suite.Require().NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if res == nil {
diff --git a/deploy/tests/e2e/config-snippet/backend_cfg_snippet.go b/deploy/tests/e2e/config-snippet/backend_cfg_snippet.go
@@ -24,7 +24,7 @@ import (
 )
 
 func (suite *ConfigSnippetSuite) TestBackendCfgSnippet() {
-	suite.NoError(suite.test.DeployYaml("config/backend-cfg-snippet.yaml", suite.test.GetNS()))
+	suite.NoError(suite.test.Apply("config/backend-cfg-snippet.yaml", suite.test.GetNS(), nil))
 	suite.Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if err != nil {
diff --git a/deploy/tests/e2e/config-snippet/frontend_cfg_snippet.go b/deploy/tests/e2e/config-snippet/frontend_cfg_snippet.go
@@ -24,7 +24,7 @@ import (
 )
 
 func (suite *ConfigSnippetSuite) TestFrontendCfgSnippet() {
-	suite.NoError(suite.test.DeployYaml("config/configmap.yaml", "haproxy-controller"))
+	suite.NoError(suite.test.Apply("config/configmap.yaml", "", nil))
 	suite.Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if err != nil {
diff --git a/deploy/tests/e2e/config-snippet/suite_test.go b/deploy/tests/e2e/config-snippet/suite_test.go
@@ -17,7 +17,6 @@
 package configsnippet
 
 import (
-	"os/exec"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -43,7 +42,7 @@ func (suite *ConfigSnippetSuite) SetupSuite() {
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
-	suite.NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if res == nil {
@@ -54,8 +53,7 @@ func (suite *ConfigSnippetSuite) SetupSuite() {
 		return res.StatusCode == 200
 	}, e2e.WaitDuration, e2e.TickDuration)
 	suite.test.AddTearDown(func() error {
-		cmd := exec.Command("kubectl", "apply", "-f", "../../config/3.configmap.yaml")
-		return cmd.Run()
+		return suite.test.Apply("../../config/3.configmap.yaml", "", nil)
 	})
 }
 
diff --git a/deploy/tests/e2e/endpoints/http_test.go b/deploy/tests/e2e/endpoints/http_test.go
@@ -31,7 +31,7 @@ func (suite *EndpointsSuite) Test_HTTP_Reach() {
 	for _, replicas := range []int{4, 8, 2, 0, 3} {
 		suite.Run(fmt.Sprintf("%d-replicas", replicas), func() {
 			suite.tmplData.Replicas = replicas
-			suite.NoError(suite.test.DeployYamlTemplate("config/endpoints.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+			suite.NoError(suite.test.Apply("config/endpoints.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 			suite.Eventually(func() bool {
 				counter := map[string]int{}
 				for i := 0; i < replicas*2; i++ {
diff --git a/deploy/tests/e2e/endpoints/suite_test.go b/deploy/tests/e2e/endpoints/suite_test.go
@@ -18,7 +18,6 @@ package endpoints
 
 import (
 	"net/http"
-	"os/exec"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -66,7 +65,7 @@ func (suite *EndpointsSuite) BeforeTest(suiteName, testName string) {
 	case "Test_HTTP_Reach":
 		suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 		suite.NoError(err)
-		suite.NoError(test.DeployYamlTemplate("config/endpoints.yaml.tmpl", test.GetNS(), suite.tmplData))
+		suite.NoError(test.Apply("config/endpoints.yaml.tmpl", test.GetNS(), suite.tmplData))
 		suite.Require().Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if res == nil {
@@ -80,11 +79,10 @@ func (suite *EndpointsSuite) BeforeTest(suiteName, testName string) {
 		suite.client, err = e2e.NewHTTPSClient("tcp-service.test", 32766)
 		suite.NoError(err)
 		suite.tmplData.Replicas = 4
-		suite.NoError(test.DeployYamlTemplate("config/endpoints.yaml.tmpl", test.GetNS(), suite.tmplData))
-		suite.NoError(test.DeployYaml("config/tcp.yaml", "haproxy-controller"))
+		suite.NoError(test.Apply("config/endpoints.yaml.tmpl", test.GetNS(), suite.tmplData))
+		suite.NoError(test.Apply("config/tcp.yaml", "", nil))
 		test.AddTearDown(func() error {
-			cmd := exec.Command("kubectl", "-n", "haproxy-controller", "delete", "cm", "haproxy-configmap-tcp")
-			return cmd.Run()
+			return suite.test.Delete("config/tcp.yaml")
 		})
 		suite.Require().Eventually(func() bool {
 			res, cls, err := suite.client.Do()
diff --git a/deploy/tests/e2e/global-config/maxconn_test.go b/deploy/tests/e2e/global-config/maxconn_test.go
@@ -17,21 +17,15 @@
 package globalconfig
 
 import (
-	"os/exec"
-
 	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 )
 
 func (suite *GlobalConfigSuite) TestMaxconn() {
-	cmd := exec.Command("kubectl", "apply", "-f", "config/configmap.yaml")
-	_, err := cmd.CombinedOutput()
-	suite.Require().NoError(err)
+	suite.NoError(suite.test.Apply("config/configmap.yaml", "", nil))
 	suite.maxconn = "1111"
 	suite.Eventually(suite.checkMaxconn, e2e.WaitDuration, e2e.TickDuration)
 
-	cmd = exec.Command("kubectl", "apply", "-f", "../../config/3.configmap.yaml")
-	_, err = cmd.CombinedOutput()
-	suite.Require().NoError(err)
+	suite.NoError(suite.test.Apply("../../config/3.configmap.yaml", "", nil))
 	suite.maxconn = "1000"
 	suite.Eventually(suite.checkMaxconn, e2e.WaitDuration, e2e.TickDuration)
 }
diff --git a/deploy/tests/e2e/global-config/suite_test.go b/deploy/tests/e2e/global-config/suite_test.go
@@ -20,13 +20,22 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
+
+	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 )
 
 type GlobalConfigSuite struct {
 	suite.Suite
+	test    e2e.Test
 	maxconn string
 }
 
+func (suite *GlobalConfigSuite) SetupSuite() {
+	var err error
+	suite.test, err = e2e.NewTest()
+	suite.NoError(err)
+}
+
 func TestGlobalConfigSuite(t *testing.T) {
 	suite.Run(t, new(GlobalConfigSuite))
 }
diff --git a/deploy/tests/e2e/https/offload.go b/deploy/tests/e2e/https/offload.go
@@ -22,7 +22,7 @@ import (
 
 func (suite *HTTPSSuite) Test_HTTPS_Offload() {
 	var err error
-	suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.client, err = e2e.NewHTTPSClient("offload-test.haproxy", 0)
 	suite.NoError(err)
 	suite.Eventually(func() bool {
diff --git a/deploy/tests/e2e/https/passthrough.go b/deploy/tests/e2e/https/passthrough.go
@@ -28,7 +28,7 @@ func (suite *HTTPSSuite) Test_HTTPS_Passthrough() {
 	suite.tmplData.IngAnnotations = []struct{ Key, Value string }{
 		{"ssl-passthrough", "'true'"},
 	}
-	suite.Require().NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Run("Reach_Backend", func() {
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
@@ -59,7 +59,7 @@ func (suite *HTTPSSuite) Test_HTTPS_Passthrough() {
 			{"ssl-passthrough", "'true'"},
 			{"whitelist", "6.6.6.6"},
 		}
-		suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if err == nil {
diff --git a/deploy/tests/e2e/https/redirect.go b/deploy/tests/e2e/https/redirect.go
@@ -21,7 +21,7 @@ import (
 )
 
 func (suite *HTTPSSuite) Test_HTTPS_Redirect() {
-	suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if res == nil {
@@ -34,7 +34,7 @@ func (suite *HTTPSSuite) Test_HTTPS_Redirect() {
 	suite.Run("implicit_via_TLS", func() {
 		suite.tmplData.TLSEnabled = true
 		suite.Eventually(func() bool {
-			suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+			suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 			res, cls, err := suite.client.Do()
 			if res == nil {
 				suite.T().Log(err)
@@ -50,7 +50,7 @@ func (suite *HTTPSSuite) Test_HTTPS_Redirect() {
 			{"ssl-redirect", "'true'"},
 			{"ssl-redirect-code", "'301'"},
 		}
-		suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if res == nil {
@@ -66,7 +66,7 @@ func (suite *HTTPSSuite) Test_HTTPS_Redirect() {
 		suite.tmplData.IngAnnotations = []struct{ Key, Value string }{
 			{"ssl-redirect", "'false'"},
 		}
-		suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if res == nil {
diff --git a/deploy/tests/e2e/https/suite_test.go b/deploy/tests/e2e/https/suite_test.go
@@ -59,7 +59,7 @@ func (suite *HTTPSSuite) SetupSuite() {
 	suite.test, err = e2e.NewTest()
 	suite.NoError(err)
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
-	suite.NoError(suite.test.DeployYaml("config/deploy.yaml", suite.test.GetNS()))
+	suite.NoError(suite.test.Apply("config/deploy.yaml", suite.test.GetNS(), nil))
 }
 
 func (suite *HTTPSSuite) TearDownSuite() {
diff --git a/deploy/tests/e2e/ingress-match/ingress_match_path_test.go b/deploy/tests/e2e/ingress-match/ingress_match_path_test.go
@@ -73,8 +73,8 @@ func (suite *IngressMatchSuite) Test_Http_MatchPath() {
 		suite.tmplData.Apps[i] = i + 1
 	}
 	suite.tmplData.Rules = ingressRules
-	suite.Require().NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
-	suite.Require().NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 
 	for _, test := range tests {
 		for _, path := range test.paths {
diff --git a/deploy/tests/e2e/ingressclass/config/deploy.yaml b/deploy/tests/e2e/ingressclass/config/deploy.yaml
@@ -40,10 +40,3 @@ spec:
       targetPort: https
   selector:
     app: http-echo
----
-apiVersion: networking.k8s.io/v1beta1
-kind: IngressClass
-metadata:
-  name: haproxy
-spec:
-  controller: haproxy.org/ingress-controller/haproxy
diff --git a/deploy/tests/e2e/ingressclass/config/ingressclass.yaml b/deploy/tests/e2e/ingressclass/config/ingressclass.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: IngressClass
+metadata:
+  name: haproxy
+spec:
+  controller: haproxy.org/ingress-controller/haproxy
diff --git a/deploy/tests/e2e/ingressclass/ingressClass_test.go b/deploy/tests/e2e/ingressclass/ingressClass_test.go
@@ -18,15 +18,14 @@ package ingressclass
 
 import (
 	"net/http"
-	"os/exec"
 
 	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 )
 
 func (suite *IngressClassSuite) Test_IngressClassName_Field() {
 	test := suite.test
 	suite.Run("Disabled", func() {
-		suite.NoError(test.DeployYamlTemplate("config/ingress.yaml.tmpl", test.GetNS(), suite.tmplData))
+		suite.NoError(test.Apply("config/ingress.yaml.tmpl", test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if err != nil {
@@ -40,7 +39,7 @@ func (suite *IngressClassSuite) Test_IngressClassName_Field() {
 
 	suite.Run("Enabled", func() {
 		suite.tmplData.IngressClassName = "haproxy"
-		suite.NoError(test.DeployYamlTemplate("config/ingress.yaml.tmpl", test.GetNS(), suite.tmplData))
+		suite.NoError(test.Apply("config/ingress.yaml.tmpl", test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if err != nil {
@@ -56,9 +55,7 @@ func (suite *IngressClassSuite) Test_IngressClassName_Field() {
 func (suite *IngressClassSuite) Test_IngressClassName_Resource() {
 	test := suite.test
 	suite.Run("Disabled", func() {
-		cmd := exec.Command("kubectl", "delete", "ingressclasses", "haproxy")
-		suite.NoError(cmd.Run())
-
+		suite.NoError(test.Delete("config/ingressclass.yaml"))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if err != nil {
@@ -71,7 +68,7 @@ func (suite *IngressClassSuite) Test_IngressClassName_Resource() {
 	})
 
 	suite.Run("Enabled", func() {
-		suite.NoError(test.DeployYaml("config/deploy.yaml", test.GetNS()))
+		suite.NoError(suite.test.Apply("config/ingressclass.yaml", "", nil))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if err != nil {
diff --git a/deploy/tests/e2e/ingressclass/suite_test.go b/deploy/tests/e2e/ingressclass/suite_test.go
@@ -17,7 +17,6 @@
 package ingressclass
 
 import (
-	"os/exec"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -49,10 +48,10 @@ func (suite *IngressClassSuite) SetupSuite() {
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
-	suite.NoError(suite.test.DeployYaml("config/deploy.yaml", suite.test.GetNS()))
+	suite.NoError(suite.test.Apply("config/deploy.yaml", suite.test.GetNS(), nil))
+	suite.NoError(suite.test.Apply("config/ingressclass.yaml", "", nil))
 	suite.test.AddTearDown(func() error {
-		cmd := exec.Command("kubectl", "delete", "ingressclasses", "haproxy")
-		return cmd.Run()
+		return suite.test.Delete("config/ingressclass.yaml")
 	})
 }
 
diff --git a/deploy/tests/e2e/proxy-protocol/suite_test.go b/deploy/tests/e2e/proxy-protocol/suite_test.go
@@ -42,7 +42,7 @@ func (suite *ProxyProtocolSuite) SetupSuite() {
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
-	suite.Require().NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 }
 
 func (suite *ProxyProtocolSuite) TearDownSuite() {
diff --git a/deploy/tests/e2e/rate-limiting/http_rate_limiting_test.go b/deploy/tests/e2e/rate-limiting/http_rate_limiting_test.go
@@ -40,7 +40,7 @@ func (suite *RateLimitingSuite) Test_Rate_Limiting() {
 				{"rate-limit-requests", fmt.Sprintf("%d", tc.limitRequests)},
 				{"rate-limit-status-code", fmt.Sprintf("%d", tc.customStatusCode)},
 			}
-			suite.Require().NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+			suite.Require().NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 			suite.Require().Eventually(func() bool {
 				var counter, responseCode int
 				suite.client.Host = suite.tmplData.Host
diff --git a/deploy/tests/e2e/rate-limiting/suite_test.go b/deploy/tests/e2e/rate-limiting/suite_test.go
@@ -43,8 +43,8 @@ func (suite *RateLimitingSuite) SetupSuite() {
 	suite.tmplData = tmplData{Host: suite.test.GetNS() + ".test"}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
-	suite.NoError(suite.test.DeployYaml("config/deploy.yaml", suite.test.GetNS()))
-	suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.NoError(suite.test.Apply("config/deploy.yaml", suite.test.GetNS(), nil))
+	suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		r, cls, err := suite.client.Do()
 		if err != nil {
diff --git a/deploy/tests/e2e/service-discovery/port_discovery.go b/deploy/tests/e2e/service-discovery/port_discovery.go
@@ -35,7 +35,7 @@ func (suite *ServiceDiscoverySuite) Test_Port_Discovery() {
 func (suite *ServiceDiscoverySuite) testServicePort(serviceName, servicePort string) {
 	suite.tmplData.ServiceName = serviceName
 	suite.tmplData.ServicePort = servicePort
-	suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if res == nil {
diff --git a/deploy/tests/e2e/service-discovery/suite_test.go b/deploy/tests/e2e/service-discovery/suite_test.go
@@ -49,8 +49,8 @@ func (suite *ServiceDiscoverySuite) SetupSuite() {
 	}
 	suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)
 	suite.NoError(err)
-	suite.NoError(suite.test.DeployYaml("config/deploy.yaml", suite.test.GetNS()))
-	suite.NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+	suite.NoError(suite.test.Apply("config/deploy.yaml", suite.test.GetNS(), nil))
+	suite.NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 	suite.Require().Eventually(func() bool {
 		res, cls, err := suite.client.Do()
 		if res == nil {
diff --git a/deploy/tests/e2e/set-header/set_header_test.go b/deploy/tests/e2e/set-header/set_header_test.go
@@ -36,7 +36,7 @@ func (suite *SetHeaderSuite) Test_Request_Set_Header() {
 		suite.tmplData.IngAnnotations = []struct{ Key, Value string }{
 			{"request-set-header", tc.headerName + " " + tc.headerValue},
 		}
-		suite.Require().NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			res, cls, err := suite.client.Do()
 			if err != nil {
@@ -73,7 +73,7 @@ func (suite *SetHeaderSuite) Test_Response_Set_Header() {
 		suite.tmplData.IngAnnotations = []struct{ Key, Value string }{
 			{"response-set-header", tc.headerName + " " + tc.headerValue},
 		}
-		suite.Require().NoError(suite.test.DeployYamlTemplate("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
+		suite.Require().NoError(suite.test.Apply("config/ingress.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 		suite.Eventually(func() bool {
 			r, cls, err := suite.client.Do()
 			if err != nil {
diff --git a/deploy/tests/e2e/set-header/set_host_test.go b/deploy/tests/e2e/set-header/set_host_test.go
diff --git a/deploy/tests/e2e/set-header/suite_test.go b/deploy/tests/e2e/set-header/suite_test.go
diff --git a/deploy/tests/e2e/source-ip/source_ip_test.go b/deploy/tests/e2e/source-ip/source_ip_test.go
diff --git a/deploy/tests/e2e/source-ip/suite_test.go b/deploy/tests/e2e/source-ip/suite_test.go
diff --git a/deploy/tests/e2e/tls-auth/suite_test.go b/deploy/tests/e2e/tls-auth/suite_test.go
diff --git a/deploy/tests/e2e/utils.go b/deploy/tests/e2e/utils.go

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func (suite *CanaryDeploymentSuite) SetupSuite() {`
`48`	`48`	`}`
`49`	`49`	`suite.client, err = e2e.NewHTTPClient(suite.tmplData.Host)`
`50`	`50`	`suite.NoError(err)`
`51`		`- suite.Require().NoError(suite.test.DeployYamlTemplate("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))`
	`51`	`+ suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))`
`52`	`52`	`suite.Require().Eventually(func() bool {`
`53`	`53`	`res, cls, err := suite.client.Do()`
`54`	`54`	`if res == nil {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func (suite *ConfigSnippetSuite) TestBackendCfgSnippet() {`
`27`		`- suite.NoError(suite.test.DeployYaml("config/backend-cfg-snippet.yaml", suite.test.GetNS()))`
	`27`	`+ suite.NoError(suite.test.Apply("config/backend-cfg-snippet.yaml", suite.test.GetNS(), nil))`
`28`	`28`	`suite.Eventually(func() bool {`
`29`	`29`	`res, cls, err := suite.client.Do()`
`30`	`30`	`if err != nil {`