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

Merge pull request #78131 from sttts/sttts-e2e-CreateMultiVersionTestCRD-fix

Browse Source 
e2e: fix CreateMultiVersionTestCRD version logic
This commit is contained in:
Kubernetes Prow Robot 2019-05-20 18:39:05 -07:00 committed by GitHub
commit fe0d89fc57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/apimachinery/crd_publish_openapi.go
View File

@ -345,16 +345,15 @@ func setupCRD(f *framework.Framework, schema []byte, groupSuffix string, version
} }
crd, err := crd.CreateMultiVersionTestCRD(f, group, func(crd *v1beta1.CustomResourceDefinition) { crd, err := crd.CreateMultiVersionTestCRD(f, group, func(crd *v1beta1.CustomResourceDefinition) {
apiVersions := []v1beta1.CustomResourceDefinitionVersion{} var apiVersions []v1beta1.CustomResourceDefinitionVersion
for _, version := range versions { for i, version := range versions {
v := v1beta1.CustomResourceDefinitionVersion{ apiVersions = append(apiVersions, v1beta1.CustomResourceDefinitionVersion{
Name: version, Name: version,
Served: true, Served: true,
Storage: false, Storage: i == 0,
})
} }
apiVersions = append(apiVersions, v) crd.Spec.Versions = apiVersions
}
apiVersions[0].Storage = true
crd.Spec.Validation = &v1beta1.CustomResourceValidation{ crd.Spec.Validation = &v1beta1.CustomResourceValidation{
OpenAPIV3Schema: props, OpenAPIV3Schema: props,