Conformance: update objects in MustApplyObjectsWithCleanup

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

conformance/base/manifests.yaml

@@ -183,7 +183,7 @@ metadata:
 spec:
   selector:
     app: infra-backend-v3
-  ports:
+  ports: 
   - protocol: TCP
     port: 8080
     targetPort: 3000
@@ -496,3 +496,4 @@ spec:
         resources:
           requests:
             cpu: 10m
+

conformance/mesh/manifests.yaml

@@ -170,3 +170,28 @@ spec:
       - name: echo
         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

@@ -137,33 +137,46 @@ func (a Applier) prepareResources(t *testing.T, decoder *yaml.YAMLOrJSONDecoder)
 }
 
 func (a Applier) MustApplyObjectsWithCleanup(t *testing.T, c client.Client, timeoutConfig config.TimeoutConfig, resources []client.Object, cleanup bool) {
-	for _, resource := range resources {
-		resource := resource
-
-		ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.CreateTimeout)
-		defer cancel()
-
-		t.Logf("Creating %s %s", resource.GetName(), resource.GetObjectKind().GroupVersionKind().Kind)
-
-		err := c.Create(ctx, resource)
-		if err != nil {
-			if !apierrors.IsAlreadyExists(err) {
-				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")
-			})
-		}
-	}
+    fmt.Print("heyyy")
+    for _, resource := range resources {
+        resource := resource
+
+        ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.CreateTimeout)
+        defer cancel()
+
+        t.Logf("Creating/Updating %s %s", resource.GetName(), resource.GetObjectKind().GroupVersionKind().Kind)
+
+        // Check if the resource exists
+       existingResource := resource.DeepCopyObject().(client.Object)
+        err := c.Get(ctx, types.NamespacedName{Name: resource.GetName(), Namespace: resource.GetNamespace()}, existingResource)
+        if err != nil {
+            if !apierrors.IsNotFound(err) {
+                t.Logf("error checking resource: %s %s", resource.GetName(), resource.GetObjectKind().GroupVersionKind().Kind)
+                require.NoError(t, err, "error checking resource")
+            }
+
+            // Resource doesn't exist, create it
+            err = c.Create(ctx, resource)
+            require.NoError(t, err, "error creating resource")
+        } else {
+            // Resource exists, update it
+            err = c.Update(ctx, resource)
+            require.NoError(t, err, "error updating 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")
+            })
+        }
+    }
 }
 
+
 // MustApplyWithCleanup creates or updates Kubernetes resources defined with the
 // provided YAML file and registers a cleanup function for resources it created.
 // Note that this does not remove resources that already existed in the cluster.
@@ -172,7 +185,7 @@ func (a Applier) MustApplyWithCleanup(t *testing.T, c client.Client, timeoutConf
 	require.NoError(t, err)
 
 	decoder := yaml.NewYAMLOrJSONDecoder(data, 4096)
-
+ 
 	resources, err := a.prepareResources(t, decoder)
 	if err != nil {
 		t.Logf("manifest: %s", data.String())

conformance/utils/kubernetes/certificate.go

@@ -54,7 +54,7 @@ func MustCreateSelfSignedCertSecret(t *testing.T, namespace, secretName string,
 	data := map[string][]byte{
 		corev1.TLSCertKey:       serverCert.Bytes(),
 		corev1.TLSPrivateKeyKey: serverKey.Bytes(),
-	}
+	} 
 
 	newSecret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{

conformance/utils/suite/suite.go

@@ -141,12 +141,12 @@ func New(s Options) *ConformanceTestSuite {
 
 // Setup ensures the base resources required for conformance tests are installed
 // in the cluster. It also ensures that all relevant resources are ready.
-func (suite *ConformanceTestSuite) Setup(t *testing.T) {
+func (suite *ConformanceTestSuite) Setup(t *testing.T) { 
 	suite.Applier.FS = suite.FS
 
 	if suite.SupportedFeatures.Has(SupportGateway) {
 		t.Logf("Test Setup: Ensuring GatewayClass has been accepted")
-		suite.ControllerName = kubernetes.GWCMustHaveAcceptedConditionTrue(t, suite.Client, suite.TimeoutConfig, suite.GatewayClassName)
+		suite.ControllerName = kubernetes.GWCMustHaveAcceptedConditionTrue(t, suite.Client, suite.TimeoutConfig, "nginx")
 
 		suite.Applier.GatewayClass = suite.GatewayClassName
 		suite.Applier.ControllerName = suite.ControllerName
@@ -156,7 +156,8 @@ func (suite *ConformanceTestSuite) Setup(t *testing.T) {
 
 		t.Logf("Test Setup: Applying programmatic resources")
 		secret := kubernetes.MustCreateSelfSignedCertSecret(t, "gateway-conformance-web-backend", "certificate", []string{"*"})
-		suite.Applier.MustApplyObjectsWithCleanup(t, suite.Client, suite.TimeoutConfig, []client.Object{secret}, suite.Cleanup)
+		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"})