Skip to content

pkg/registry: use v1beta1.CustomResourceDefinition, as the apiextensions type is internal #86

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
openshift-merge-robot merged 1 commit into from
Oct 12, 2019
Merged

pkg/registry: use v1beta1.CustomResourceDefinition, as the apiextensions type is internal #86

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
22 changes: 12 additions & 10 deletions pkg/registry/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package registry

import (
"encoding/json"
"fmt"
"strings"

"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -35,7 +33,7 @@ type Bundle struct {
Package string
Channel string
csv *ClusterServiceVersion
crds []*apiextensions.CustomResourceDefinition
crds []*v1beta1.CustomResourceDefinition
cacheStale bool
}

Expand Down Expand Up @@ -76,7 +74,7 @@ func (b *Bundle) ClusterServiceVersion() (*ClusterServiceVersion, error) {
return b.csv, nil
}

func (b *Bundle) CustomResourceDefinitions() ([]*apiextensions.CustomResourceDefinition, error) {
func (b *Bundle) CustomResourceDefinitions() ([]*v1beta1.CustomResourceDefinition, error) {
if err := b.cache(); err != nil {
return nil, err
}
Expand Down Expand Up @@ -104,6 +102,9 @@ func (b *Bundle) ProvidedAPIs() (map[APIKey]struct{}, error) {
}

ownedAPIs, _, err := csv.GetApiServiceDefinitions()
if err != nil {
return nil, err
}
for _, api := range ownedAPIs {
provided[APIKey{Group: api.Group, Version: api.Version, Kind: api.Kind, Plural: api.Name}] = struct{}{}
}
Expand Down Expand Up @@ -210,19 +211,20 @@ func (b *Bundle) cache() error {
}

if b.crds == nil {
b.crds = []*apiextensions.CustomResourceDefinition{}
b.crds = []*v1beta1.CustomResourceDefinition{}
}
for _, o := range b.Objects {
if o.GetObjectKind().GroupVersionKind().Kind == "CustomResourceDefinition" {
crd := &apiextensions.CustomResourceDefinition{}
// Marshal Unstructured and Unmarshal as CustomResourceDefinition. FromUnstructured has issues
crd := &v1beta1.CustomResourceDefinition{}
// Marshal Unstructured and Decode as CustomResourceDefinition. FromUnstructured has issues
// converting JSON numbers to float64 for CRD minimum/maximum validation.
bytes, err := o.MarshalJSON()
cb, err := o.MarshalJSON()
if err != nil {
return err
}
if err := json.Unmarshal(bytes, &crd); err != nil {
return err
dec := serializer.NewCodecFactory(Scheme).UniversalDeserializer()
if _, _, err = dec.Decode(cb, nil, crd); err != nil {
return fmt.Errorf("error decoding CRD: %v", err)
}
b.crds = append(b.crds, crd)
}
Expand Down