github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

update openapi overlap test for crd v1

Browse Source
This commit is contained in:
David Eads 2021-04-13 14:22:03 -04:00
parent b199047fa6
commit e6113c5fe6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/integration/master/kube_apiserver_test.go
View File

@ -199,7 +199,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) 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 { if err != nil {
t.Fatalf("unexpected error getting CRD OpenAPI path: %v", err) t.Fatalf("unexpected error getting CRD OpenAPI path: %v", err)
} }
@ -224,7 +224,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
}, },
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{ Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
{ {
Name: "v1beta1", Name: "v1",
Served: true, Served: true,
Storage: true, Storage: true,
Schema: &apiextensionsv1.CustomResourceValidation{ Schema: &apiextensionsv1.CustomResourceValidation{
@ -247,7 +247,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
} }
// Expect the CRD path to not change // 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 { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -289,7 +289,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
}, },
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{ Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
{ {
Name: "v1beta1", Name: "v1",
Served: true, Served: true,
Storage: true, Storage: true,
Schema: &apiextensionsv1.CustomResourceValidation{ 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. // 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 { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }