From 1cfed1cca696eedd77e1af549f637de6418e528b Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Tue, 21 May 2019 16:09:42 -0700 Subject: [PATCH] fix crd openapi alpha e2e make schema used in e2e structural so it can be published; GET before UPDATE to tolerate object change --- test/e2e/apimachinery/crd_publish_openapi.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/e2e/apimachinery/crd_publish_openapi.go b/test/e2e/apimachinery/crd_publish_openapi.go index fed04d05743..99967a3cf33 100644 --- a/test/e2e/apimachinery/crd_publish_openapi.go +++ b/test/e2e/apimachinery/crd_publish_openapi.go @@ -32,6 +32,7 @@ import ( "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/apiserver/validation" apiequality "k8s.io/apimachinery/pkg/api/equality" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" @@ -309,6 +310,10 @@ var _ = SIGDescribe("CustomResourcePublishOpenAPI [Feature:CustomResourcePublish } ginkgo.By("mark a version not serverd") + crd.Crd, err = crd.APIExtensionClient.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crd.Crd.Name, metav1.GetOptions{}) + if err != nil { + framework.Failf("%v", err) + } crd.Crd.Spec.Versions[1].Served = false crd.Crd, err = crd.APIExtensionClient.ApiextensionsV1beta1().CustomResourceDefinitions().Update(crd.Crd) if err != nil { @@ -579,9 +584,11 @@ properties: properties: dummy: description: Dummy property. + type: object status: description: Status of Waldo type: object properties: bars: - description: List of Bars and their statuses.`) + description: List of Bars and their statuses. + type: array`)