Fix: MustApplyObjectsWithCleanup

Signed-off-by: sadath-12 <sadathsadu2002@gmail.com>

Author: sadath-12

conformance/mesh/manifests.yaml

@@ -171,27 +171,4 @@ spec:
         image: gcr.io/k8s-staging-gateway-api/echo-server:v20230505-v0.7.0-rc1-10-g497e67da
         imagePullPolicy: IfNotPresent
 
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: echo-v1
-  namespace: gateway-conformance-mesh-consumer
-  labels:
-    app: echo-v2
-spec:
-  selector:
-    matchLabels:
-      app: echo-v2
-      version: v1
-  template:
-    metadata:
-      labels:
-        app: echo-v2
-        version: v1
-    spec:
-      containers:
-      - name: echo
-        image: gcr.io/k8s-staging-gateway-api/echo-server:v20230505-v0.7.0-rc1-10-g497e67da
-        imagePullPolicy: IfNotPresent        
+    

conformance/utils/kubernetes/apply.go

@@ -154,14 +154,26 @@ func (a Applier) MustApplyObjectsWithCleanup(t *testing.T, c client.Client, time
 			t.Logf("Creating %s %s", resource.GetName(), resource.GetObjectKind().GroupVersionKind().Kind)
 			err = c.Create(ctx, resource)
 			require.NoError(t, err, "error creating resource")
+
+			if cleanup {
+				t.Cleanup(func() {
+					ctx, cancel = context.WithTimeout(context.Background(), timeoutConfig.DeleteTimeout)
+					defer cancel()
+					t.Logf("Deleting %s %s", resource.GetName(), resource.GetObjectKind().GroupVersionKind().Kind)
+					err = c.Delete(ctx, resource)
+					require.NoErrorf(t, err, "error deleting resource")
+				})
+			}
+
+			continue
+
 		}
 		// Resource exists, update it
 		t.Logf("Updating %s %s", resource.GetName(), resource.GetObjectKind().GroupVersionKind().Kind)
 
 		resource.SetResourceVersion(existingResource.GetResourceVersion())
 
 		err = c.Update(ctx, resource)
-		require.NoError(t, err, "error updating resource")
 
 		if cleanup {
 			t.Cleanup(func() {
@@ -172,6 +184,8 @@ func (a Applier) MustApplyObjectsWithCleanup(t *testing.T, c client.Client, time
 				require.NoErrorf(t, err, "error deleting resource")
 			})
 		}
+
+		require.NoErrorf(t, err, "error updating resource")
 	}
 }