From c769c2db6ed5267b7f70d93d85c1b9b60a6d51bc Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 30 Nov 2023 14:01:24 -0500 Subject: [PATCH] Revert conformance test addition of root paths --- test/e2e/apimachinery/aggregator.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index b7f12162dc6..529c3353228 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -52,7 +52,6 @@ import ( admissionapi "k8s.io/pod-security-admission/api" samplev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1" "k8s.io/utils/pointer" - "k8s.io/utils/strings/slices" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" @@ -737,24 +736,6 @@ func TestSampleAPIServer(ctx context.Context, f *framework.Framework, aggrclient framework.ExpectNoError(err, "failed to count the required APIServices") framework.Logf("APIService %s has been deleted.", apiServiceName) - ginkgo.By("Confirm that the group path of " + apiServiceName + " was removed from root paths") - groupPath := "/apis/" + apiServiceGroupName - err = wait.PollUntilContextTimeout(ctx, apiServiceRetryPeriod, apiServiceRetryTimeout, true, func(ctx context.Context) (done bool, err error) { - rootPaths := metav1.RootPaths{} - statusContent, err = restClient.Get(). - AbsPath("/"). - SetHeader("Accept", "application/json").DoRaw(ctx) - if err != nil { - return false, err - } - err = json.Unmarshal(statusContent, &rootPaths) - if err != nil { - return false, err - } - return !slices.Contains(rootPaths.Paths, groupPath), nil - }) - framework.ExpectNoError(err, "Expected to not find %s from root paths", groupPath) - cleanupSampleAPIServer(ctx, client, aggrclient, n, apiServiceName) }