From e6113c5fe6168c5a047ee60d9d0aab38e6c44b08 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 13 Apr 2021 14:22:03 -0400 Subject: [PATCH] update openapi overlap test for crd v1 --- test/integration/master/kube_apiserver_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/master/kube_apiserver_test.go b/test/integration/master/kube_apiserver_test.go index ba303e6d74f..6db6243d7ad 100644 --- a/test/integration/master/kube_apiserver_test.go +++ b/test/integration/master/kube_apiserver_test.go @@ -199,7 +199,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - crdPath, exist, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/{name}`) + crdPath, exist, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}`) if err != nil { t.Fatalf("unexpected error getting CRD OpenAPI path: %v", err) } @@ -224,7 +224,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { }, Versions: []apiextensionsv1.CustomResourceDefinitionVersion{ { - Name: "v1beta1", + Name: "v1", Served: true, Storage: true, Schema: &apiextensionsv1.CustomResourceValidation{ @@ -247,7 +247,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { } // Expect the CRD path to not change - path, _, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/{name}`) + path, _, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}`) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -289,7 +289,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { }, Versions: []apiextensionsv1.CustomResourceDefinitionVersion{ { - Name: "v1beta1", + Name: "v1", Served: true, Storage: true, Schema: &apiextensionsv1.CustomResourceValidation{ @@ -312,7 +312,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { } // Expect the apiextensions definition to not change, since the overlapping definition will get renamed. - apiextensionsDefinition, exist, err := getOpenAPIDefinition(apiextensionsclient, `io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition`) + apiextensionsDefinition, exist, err := getOpenAPIDefinition(apiextensionsclient, `io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.CustomResourceDefinition`) if err != nil { t.Fatalf("unexpected error: %v", err) }