From 0ad131068b1ea5e40f61ebd59ec9a70a28ab9d05 Mon Sep 17 00:00:00 2001
From: candita <cholman@redhat.com>
Date: Thu, 29 Aug 2024 00:14:13 -0400
Subject: [PATCH] Update tests after implementation testing
 conformance/base/manifests.yaml - fix yaml
 conformance/tests/backendtlspolicy.yaml - fix yaml
 conformance/tests/tlsroute-simple-same-namespace.go - rename cert for sharing
 conformance/utils/suite/conformance.go - fix a bug in cleanup-base-resources
 flag application conformance/utils/suite/suite.go - rename cert for sharing

---
 conformance/base/manifests.yaml               |  4 +--
 conformance/tests/backendtlspolicy.yaml       | 26 +++++++++++++++++--
 .../tests/tlsroute-simple-same-namespace.go   |  2 +-
 conformance/utils/suite/conformance.go        |  2 +-
 conformance/utils/suite/suite.go              |  2 +-
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/conformance/base/manifests.yaml b/conformance/base/manifests.yaml
index 852c2767a7..13cf2532ab 100644
--- a/conformance/base/manifests.yaml
+++ b/conformance/base/manifests.yaml
@@ -300,7 +300,7 @@ spec:
       volumes:
       - name: secret-volume
         secret:
-          secretName: tls-passthrough-checks-certificate
+          secretName: tls-checks-certificate
           items:
           - key: tls.crt
             path: crt
@@ -763,7 +763,7 @@ spec:
     spec:
       containers:
       - name: backendtlspolicy-test
-        image: gcr.io/k8s-staging-gateway-api/echo-basic:v20240412-v1.0.0-394-g40c666fd
+        image: gcr.io/k8s-staging-gateway-api/echo-basic:v20240827-v1.1.0-121-g650e404a
         volumeMounts:
         - name: secret-volume
           mountPath: /etc/secret-volume
diff --git a/conformance/tests/backendtlspolicy.yaml b/conformance/tests/backendtlspolicy.yaml
index 740509911a..0ff4ba1e9d 100644
--- a/conformance/tests/backendtlspolicy.yaml
+++ b/conformance/tests/backendtlspolicy.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: gateway-backendtlspolicy
@@ -9,6 +9,12 @@ spec:
   - name: https
     port: 443
     protocol: HTTPS
+    tls:
+      mode: Terminate
+      certificateRefs:
+      - group: ""
+        kind: Secret
+        name: tls-checks-certificate
     hostname: "*.example.com"
     allowedRoutes:
       namespaces:
@@ -28,7 +34,23 @@ spec:
     name: "backendtlspolicy-test"
   validation:
     caCertificateRefs:
-      group: ""
+    - group: ""
       kind: Secret
       name: "backend-tls-checks-certificate"
     hostname: "abc.example.com"
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: gateway-conformance-infra-test
+  namespace: gateway-conformance-infra
+spec:
+  parentRefs:
+  - name: gateway-backendtlspolicy
+    namespace: gateway-conformance-infra
+  hostnames:
+  - abc.example.com
+  rules:
+  - backendRefs:
+    - name: tls-backend
+      port: 443
\ No newline at end of file
diff --git a/conformance/tests/tlsroute-simple-same-namespace.go b/conformance/tests/tlsroute-simple-same-namespace.go
index 1a25676b6a..1fd5f4aca1 100644
--- a/conformance/tests/tlsroute-simple-same-namespace.go
+++ b/conformance/tests/tlsroute-simple-same-namespace.go
@@ -49,7 +49,7 @@ var TLSRouteSimpleSameNamespace = suite.ConformanceTest{
 		ns := "gateway-conformance-infra"
 		routeNN := types.NamespacedName{Name: "gateway-conformance-infra-test", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "gateway-tlsroute", Namespace: ns}
-		certNN := types.NamespacedName{Name: "tls-passthrough-checks-certificate", Namespace: ns}
+		certNN := types.NamespacedName{Name: "tls-checks-certificate", Namespace: ns}
 
 		kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{ns})
 
diff --git a/conformance/utils/suite/conformance.go b/conformance/utils/suite/conformance.go
index fa0ce20050..3b71f1c2a4 100644
--- a/conformance/utils/suite/conformance.go
+++ b/conformance/utils/suite/conformance.go
@@ -62,7 +62,7 @@ func (test *ConformanceTest) Run(t *testing.T, suite *ConformanceTestSuite) {
 
 	for _, manifestLocation := range test.Manifests {
 		tlog.Logf(t, "Applying %s", manifestLocation)
-		suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, manifestLocation, true)
+		suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, manifestLocation, suite.Cleanup)
 	}
 
 	test.Test(t, suite)
diff --git a/conformance/utils/suite/suite.go b/conformance/utils/suite/suite.go
index 9215e1c9c7..a3a097ba72 100644
--- a/conformance/utils/suite/suite.go
+++ b/conformance/utils/suite/suite.go
@@ -350,7 +350,7 @@ func (suite *ConformanceTestSuite) Setup(t *testing.T, tests []ConformanceTest)
 		suite.Applier.MustApplyObjectsWithCleanup(t, suite.Client, suite.TimeoutConfig, []client.Object{secret}, suite.Cleanup)
 		secret = kubernetes.MustCreateSelfSignedCertSecret(t, "gateway-conformance-infra", "tls-validity-checks-certificate", []string{"*", "*.org"})
 		suite.Applier.MustApplyObjectsWithCleanup(t, suite.Client, suite.TimeoutConfig, []client.Object{secret}, suite.Cleanup)
-		secret = kubernetes.MustCreateSelfSignedCertSecret(t, "gateway-conformance-infra", "tls-passthrough-checks-certificate", []string{"abc.example.com"})
+		secret = kubernetes.MustCreateSelfSignedCertSecret(t, "gateway-conformance-infra", "tls-checks-certificate", []string{"abc.example.com"})
 		suite.Applier.MustApplyObjectsWithCleanup(t, suite.Client, suite.TimeoutConfig, []client.Object{secret}, suite.Cleanup)
 		secret = kubernetes.MustCreateSelfSignedCertSecret(t, "gateway-conformance-app-backend", "tls-passthrough-checks-certificate", []string{"abc.example.com"})
 		suite.Applier.MustApplyObjectsWithCleanup(t, suite.Client, suite.TimeoutConfig, []client.Object{secret}, suite.Cleanup)