From e570744ca99e39d210855d7d7fe50f63fdc5470f Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 6 Apr 2022 12:34:49 -0400 Subject: [PATCH] Revert "add test to dry-run for unwanted generated values" This reverts commit 48994c1518982143de81ccec555f6b947f8d8d8f. --- test/integration/dryrun/dryrun_test.go | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/test/integration/dryrun/dryrun_test.go b/test/integration/dryrun/dryrun_test.go index 95897b90e70..aa6138a7892 100644 --- a/test/integration/dryrun/dryrun_test.go +++ b/test/integration/dryrun/dryrun_test.go @@ -46,33 +46,16 @@ var kindAllowList = sets.NewString() // namespace used for all tests, do not change this const testNamespace = "dryrunnamespace" -func DryRunCreateWithGenerateNameTest(t *testing.T, rsc dynamic.ResourceInterface, obj *unstructured.Unstructured, gvResource schema.GroupVersionResource) { - // Create a new object with generateName - gnObj := obj.DeepCopy() - gnObj.SetGenerateName(obj.GetName() + "-") - gnObj.SetName("") - DryRunCreateTest(t, rsc, gnObj, gvResource) -} - func DryRunCreateTest(t *testing.T, rsc dynamic.ResourceInterface, obj *unstructured.Unstructured, gvResource schema.GroupVersionResource) { createdObj, err := rsc.Create(context.TODO(), obj, metav1.CreateOptions{DryRun: []string{metav1.DryRunAll}}) if err != nil { - t.Fatalf("failed to dry-run create stub for %s: %#v: %v", gvResource, err, obj) + t.Fatalf("failed to dry-run create stub for %s: %#v", gvResource, err) } if obj.GroupVersionKind() != createdObj.GroupVersionKind() { t.Fatalf("created object doesn't have the same gvk as original object: got %v, expected %v", createdObj.GroupVersionKind(), obj.GroupVersionKind()) } - if createdObj.GetUID() != "" { - t.Fatalf("created object shouldn't have a uid: %v", createdObj) - } - if createdObj.GetResourceVersion() != "" { - t.Fatalf("created object shouldn't have a resource version: %v", createdObj) - } - if obj.GetGenerateName() != "" && createdObj.GetName() != "" { - t.Fatalf("created object's name should be an empty string if using GenerateName: %v", createdObj) - } if _, err := rsc.Get(context.TODO(), obj.GetName(), metav1.GetOptions{}); !apierrors.IsNotFound(err) { t.Fatalf("object shouldn't exist: %v", err) @@ -299,7 +282,6 @@ func TestDryRun(t *testing.T) { name := obj.GetName() DryRunCreateTest(t, rsc, obj, gvResource) - DryRunCreateWithGenerateNameTest(t, rsc, obj, gvResource) if _, err := rsc.Create(context.TODO(), obj, metav1.CreateOptions{}); err != nil { t.Fatalf("failed to create stub for %s: %#v", gvResource, err)