diff --git a/test/e2e/auth/selfsubjectreviews.go b/test/e2e/auth/selfsubjectreviews.go index 6de6399190d..1866e80257a 100644 --- a/test/e2e/auth/selfsubjectreviews.go +++ b/test/e2e/auth/selfsubjectreviews.go @@ -46,68 +46,68 @@ var _ = SIGDescribe("SelfSubjectReview [Feature:APISelfSubjectReview]", func() { The selfsubjectreviews resource MUST exist in the /apis/authentication.k8s.io/v1beta1 discovery document. The selfsubjectreviews resource MUST support create. */ - ginkgo.It("should support SelfSubjectReview API operations", func(ctx context.Context) { - ginkgo.DescribeTable( - "testing SSR in different API groups", - func(apiVersion, gv string) { - // Discovery - ginkgo.By("getting /apis") - { - discoveryGroups, err := f.ClientSet.Discovery().ServerGroups() - framework.ExpectNoError(err) - found := false - for _, group := range discoveryGroups.Groups { - if group.Name == authenticationv1alpha1.GroupName { - for _, version := range group.Versions { - if version.Version == apiVersion { - found = true - break - } + ginkgo.DescribeTable( + "testing SSR in different API groups", + func(ctx context.Context, apiVersion, gv string) { + // Discovery + ginkgo.By("getting /apis") + { + discoveryGroups, err := f.ClientSet.Discovery().ServerGroups() + framework.ExpectNoError(err) + found := false + for _, group := range discoveryGroups.Groups { + if group.Name == authenticationv1alpha1.GroupName { + for _, version := range group.Versions { + if version.Version == apiVersion { + found = true + break } } } - if !found { - ginkgo.Skip(fmt.Sprintf("expected SelfSubjectReview API group/version, got %#v", discoveryGroups.Groups)) + } + if !found { + ginkgo.Skip(fmt.Sprintf("expected SelfSubjectReview API group/version, got %#v", discoveryGroups.Groups)) + } + } + + ginkgo.By("getting /apis/authentication.k8s.io") + { + group := &metav1.APIGroup{} + err := f.ClientSet.Discovery().RESTClient().Get().AbsPath("/apis/authentication.k8s.io").Do(ctx).Into(group) + framework.ExpectNoError(err) + found := false + for _, version := range group.Versions { + if version.Version == apiVersion { + found = true + break } } + if !found { + ginkgo.Skip(fmt.Sprintf("expected SelfSubjectReview API version, got %#v", group.Versions)) + } + } - ginkgo.By("getting /apis/authentication.k8s.io") - { - group := &metav1.APIGroup{} - err := f.ClientSet.Discovery().RESTClient().Get().AbsPath("/apis/authentication.k8s.io").Do(ctx).Into(group) - framework.ExpectNoError(err) - found := false - for _, version := range group.Versions { - if version.Version == apiVersion { - found = true - break - } - } - if !found { - ginkgo.Skip(fmt.Sprintf("expected SelfSubjectReview API version, got %#v", group.Versions)) + ginkgo.By("getting /apis/authentication.k8s.io/" + apiVersion) + { + resources, err := f.ClientSet.Discovery().ServerResourcesForGroupVersion(gv) + framework.ExpectNoError(err) + found := false + for _, resource := range resources.APIResources { + switch resource.Name { + case "selfsubjectreviews": + found = true } } - - ginkgo.By("getting /apis/authentication.k8s.io/" + apiVersion) - { - resources, err := f.ClientSet.Discovery().ServerResourcesForGroupVersion(gv) - framework.ExpectNoError(err) - found := false - for _, resource := range resources.APIResources { - switch resource.Name { - case "selfsubjectreviews": - found = true - } - } - if !found { - ginkgo.Skip(fmt.Sprintf("expected selfsubjectreviews, got %#v", resources.APIResources)) - } + if !found { + ginkgo.Skip(fmt.Sprintf("expected selfsubjectreviews, got %#v", resources.APIResources)) } - }, - ginkgo.Entry("authentication/v1alpha1", "v1alpha1", authenticationv1alpha1.SchemeGroupVersion.String()), - ginkgo.Entry("authentication/v1beta1", "v1beta1", authenticationv1beta1.SchemeGroupVersion.String()), - ) + } + }, + ginkgo.Entry("authentication/v1alpha1", "v1alpha1", authenticationv1alpha1.SchemeGroupVersion.String()), + ginkgo.Entry("authentication/v1beta1", "v1beta1", authenticationv1beta1.SchemeGroupVersion.String()), + ) + ginkgo.It("should support SelfSubjectReview API operations", func(ctx context.Context) { // Check creating ginkgo.By("creating SSR authentication/v1alpha1") {