Skip to content

Commit fe0d89f

Browse files
authored
Merge pull request kubernetes#78131 from sttts/sttts-e2e-CreateMultiVersionTestCRD-fix
e2e: fix CreateMultiVersionTestCRD version logic
2 parents 15d88d1 + 9e04e77 commit fe0d89f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

test/e2e/apimachinery/crd_publish_openapi.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,16 +345,15 @@ func setupCRD(f *framework.Framework, schema []byte, groupSuffix string, version
345345
}
346346

347347
crd, err := crd.CreateMultiVersionTestCRD(f, group, func(crd *v1beta1.CustomResourceDefinition) {
348-
apiVersions := []v1beta1.CustomResourceDefinitionVersion{}
349-
for _, version := range versions {
350-
v := v1beta1.CustomResourceDefinitionVersion{
348+
var apiVersions []v1beta1.CustomResourceDefinitionVersion
349+
for i, version := range versions {
350+
apiVersions = append(apiVersions, v1beta1.CustomResourceDefinitionVersion{
351351
Name: version,
352352
Served: true,
353-
Storage: false,
354-
}
355-
apiVersions = append(apiVersions, v)
353+
Storage: i == 0,
354+
})
356355
}
357-
apiVersions[0].Storage = true
356+
crd.Spec.Versions = apiVersions
358357

359358
crd.Spec.Validation = &v1beta1.CustomResourceValidation{
360359
OpenAPIV3Schema: props,

0 commit comments

Comments
 (0)