Skip to content

Commit

Permalink
Revert conformance test addition of root paths
Browse files Browse the repository at this point in the history
  • Loading branch information
liggitt committed Nov 30, 2023
1 parent ad9b60e commit c769c2d
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions test/e2e/apimachinery/aggregator.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}

Expand Down

0 comments on commit c769c2d

Please sign in to comment.