update

Signed-off-by: sjcsjc123 <[email protected]>
alibaba · Jan 12, 2024 · 6b17394 · 6b17394
1 parent e3929d3
commit 6b17394
Showing 1 changed file with 29 additions and 22 deletions.
diff --git a/test/e2e/conformance/utils/kubernetes/apply.go b/test/e2e/conformance/utils/kubernetes/apply.go
@@ -97,6 +97,15 @@ func (a Applier) MustApplyObjectsWithCleanup(t *testing.T, c client.Client, time
 		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)
@@ -105,16 +114,6 @@ func (a Applier) MustApplyObjectsWithCleanup(t *testing.T, c client.Client, time
 				err := c.Delete(ctx, resource)
 				require.NoErrorf(t, err, "error deleting resource")
 			})
-			return
-		}
-
-		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")
-			}
 		}
 	}
 }
@@ -142,18 +141,6 @@ func (a Applier) MustApplyWithCleanup(t *testing.T, c client.Client, timeoutConf
 
 		namespacedName := types.NamespacedName{Namespace: uObj.GetNamespace(), Name: uObj.GetName()}
 		fetchedObj := uObj.DeepCopy()
-
-		if cleanup {
-			t.Cleanup(func() {
-				ctx, cancel = context.WithTimeout(context.Background(), timeoutConfig.DeleteTimeout)
-				defer cancel()
-				t.Logf("🚮 Deleting %s %s", uObj.GetName(), uObj.GetKind())
-				err = c.Delete(ctx, uObj)
-				require.NoErrorf(t, err, "error deleting resource")
-			})
-			continue
-		}
-
 		err := c.Get(ctx, namespacedName, fetchedObj)
 		if err != nil {
 			if !apierrors.IsNotFound(err) {
@@ -162,12 +149,32 @@ func (a Applier) MustApplyWithCleanup(t *testing.T, c client.Client, timeoutConf
 			t.Logf("🏗 Creating %s %s", uObj.GetName(), uObj.GetKind())
 			err = c.Create(ctx, uObj)
 			require.NoErrorf(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", uObj.GetName(), uObj.GetKind())
+					err = c.Delete(ctx, uObj)
+					require.NoErrorf(t, err, "error deleting resource")
+				})
+			}
 			continue
 		}
 
 		uObj.SetResourceVersion(fetchedObj.GetResourceVersion())
 		t.Logf("🏗 Updating %s %s", uObj.GetName(), uObj.GetKind())
 		err = c.Update(ctx, uObj)
+
+		if cleanup {
+			t.Cleanup(func() {
+				ctx, cancel = context.WithTimeout(context.Background(), timeoutConfig.DeleteTimeout)
+				defer cancel()
+				t.Logf("🚮 Deleting %s %s", uObj.GetName(), uObj.GetKind())
+				err = c.Delete(ctx, uObj)
+				require.NoErrorf(t, err, "error deleting resource")
+			})
+		}
 		require.NoErrorf(t, err, "error updating resource")
 	}
 }