Skip to content

Bug 1838756: fix(validation): Fix CRD v1beta int-float conversion error #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2020
Merged

Bug 1838756: fix(validation): Fix CRD v1beta int-float conversion error #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...e/testdata/validate/valid_bundle/manifests/etcdclusters.etcd.database.coreos.com.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@ spec:
singular: etcdcluster
scope: Namespaced
version: v1beta2
validation:
openAPIV3Schema:
properties:
spec:
type: object
properties:
test:
type: integer
minimum: 1
maximum: 32767
5 changes: 3 additions & 2 deletions pkg/lib/bundle/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,11 @@ func (i imageValidator) ValidateBundleContent(manifestDir string) error {
}
}
} else if gvk.Kind == CRDKind {
dec := k8syaml.NewYAMLOrJSONDecoder(strings.NewReader(string(data)), 30)
switch gv := gvk.GroupVersion().String(); gv {
case v1CRDapiVersion:
crd := &apiextensionsv1.CustomResourceDefinition{}
err := runtime.DefaultUnstructuredConverter.FromUnstructured(k8sFile.Object, crd)
err := dec.Decode(crd)
if err != nil {
validationErrors = append(validationErrors, err)
continue
Expand All @@ -330,7 +331,7 @@ func (i imageValidator) ValidateBundleContent(manifestDir string) error {
}
case v1beta1CRDapiVersion:
crd := &apiextensionsv1beta1.CustomResourceDefinition{}
err := runtime.DefaultUnstructuredConverter.FromUnstructured(k8sFile.Object, crd)
err := dec.Decode(crd)
if err != nil {
validationErrors = append(validationErrors, err)
continue
Expand Down