Skip to content

[release-4.7] Bug 1986932: resolver: remove legacy support for fallback parsing of CSVs #2404

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
Oct 21, 2021
Merged

[release-4.7] Bug 1986932: resolver: remove legacy support for fallback parsing of CSVs #2404

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
25 changes: 0 additions & 25 deletions pkg/controller/registry/resolver/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,31 +278,6 @@ func NewOperatorFromBundle(bundle *api.Bundle, startingCSV string, sourceKey reg
properties = append(properties, ps...)
}

// legacy support - if the grpc api doesn't contain required/provided apis, fallback to csv parsing
if len(required) == 0 && len(provided) == 0 && len(properties) == 0 {
// fallback to csv parsing
if bundle.CsvJson == "" {
if bundle.GetBundlePath() != "" {
return nil, fmt.Errorf("couldn't parse bundle path, missing provided and required apis")
}

return nil, fmt.Errorf("couldn't parse bundle, missing provided and required apis")
}

csv := &v1alpha1.ClusterServiceVersion{}
if err := json.Unmarshal([]byte(bundle.CsvJson), csv); err != nil {
return nil, err
}

op, err := NewOperatorFromV1Alpha1CSV(csv)
if err != nil {
return nil, err
}
op.sourceInfo = sourceInfo
op.bundle = bundle
return op, nil
}

return &Operator{
name: bundle.CsvName,
replaces: bundle.Replaces,
Expand Down
103 changes: 8 additions & 95 deletions pkg/controller/registry/resolver/operators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import (
"encoding/json"
"testing"

"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"

"github.com/blang/semver/v4"
"github.com/stretchr/testify/require"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

opver "github.com/operator-framework/api/pkg/lib/version"
"github.com/operator-framework/api/pkg/operators/v1alpha1"
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
"github.com/operator-framework/operator-registry/pkg/api"
opregistry "github.com/operator-framework/operator-registry/pkg/registry"
)
Expand Down Expand Up @@ -1078,8 +1077,7 @@ func TestNewOperatorFromBundle(t *testing.T) {
sourceKey: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
},
want: &Operator{
// lack of full api response falls back to csv name
name: "testCSV",
name: "testBundle",
version: &version.Version,
providedAPIs: EmptyAPISet(),
requiredAPIs: EmptyAPISet(),
Expand Down Expand Up @@ -1155,81 +1153,16 @@ func TestNewOperatorFromBundle(t *testing.T) {
},
},
{
name: "BundleReplaceOverrides",
name: "BundleIgnoreCSV",
args: args{
bundle: bundleNoAPIs,
bundle: bundleWithAPIsUnextracted,
sourceKey: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
},
want: &Operator{
// lack of full api response falls back to csv name
name: "testCSV",
name: "testBundle",
providedAPIs: EmptyAPISet(),
requiredAPIs: EmptyAPISet(),
bundle: bundleNoAPIs,
version: &version.Version,
sourceInfo: &OperatorSourceInfo{
Package: "testPackage",
Channel: "testChannel",
Catalog: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
},
},
},
{
name: "BundleCsvFallback",
args: args{
bundle: bundleWithAPIsUnextracted,
sourceKey: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
},
want: &Operator{
name: "testCSV",
providedAPIs: APISet{
opregistry.APIKey{
Group: "crd.group.com",
Version: "v1",
Kind: "OwnedCRD",
Plural: "owneds",
}: struct{}{},
opregistry.APIKey{
Group: "apis.group.com",
Version: "v1",
Kind: "OwnedAPI",
Plural: "ownedapis",
}: struct{}{},
},
requiredAPIs: APISet{
opregistry.APIKey{
Group: "crd.group.com",
Version: "v1",
Kind: "RequiredCRD",
Plural: "requireds",
}: struct{}{},
opregistry.APIKey{
Group: "apis.group.com",
Version: "v1",
Kind: "RequiredAPI",
Plural: "requiredapis",
}: struct{}{},
},
properties: []*api.Property{
{
Type: "olm.gvk",
Value: "{\"group\":\"crd.group.com\",\"kind\":\"OwnedCRD\",\"version\":\"v1\"}",
},
{
Type: "olm.gvk",
Value: "{\"group\":\"apis.group.com\",\"kind\":\"OwnedAPI\",\"version\":\"v1\"}",
},
{
Type: "olm.gvk.required",
Value: "{\"group\":\"apis.group.com\",\"kind\":\"RequiredAPI\",\"version\":\"v1\"}",
},
{
Type: "olm.gvk.required",
Value: "{\"group\":\"crd.group.com\",\"kind\":\"RequiredCRD\",\"version\":\"v1\"}",
},
},
bundle: bundleWithAPIsUnextracted,
version: &version.Version,
bundle: bundleWithAPIsUnextracted,
sourceInfo: &OperatorSourceInfo{
Package: "testPackage",
Channel: "testChannel",
Expand All @@ -1238,14 +1171,14 @@ func TestNewOperatorFromBundle(t *testing.T) {
},
},
{
name: "bundle in default channel",
name: "BundleInDefaultChannel",
args: args{
bundle: bundleNoAPIs,
sourceKey: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
defaultChannel: "testChannel",
},
want: &Operator{
name: "testCSV",
name: "testBundle",
version: &version.Version,
providedAPIs: EmptyAPISet(),
requiredAPIs: EmptyAPISet(),
Expand All @@ -1258,26 +1191,6 @@ func TestNewOperatorFromBundle(t *testing.T) {
},
},
},
{
name: "BundleNoAPIs",
args: args{
bundle: bundleNoAPIs,
sourceKey: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
},
want: &Operator{
// lack of full api response falls back to csv name
name: "testCSV",
version: &version.Version,
providedAPIs: EmptyAPISet(),
requiredAPIs: EmptyAPISet(),
bundle: bundleNoAPIs,
sourceInfo: &OperatorSourceInfo{
Package: "testPackage",
Channel: "testChannel",
Catalog: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
},
},
},
{
name: "BundleWithPropertiesAndDependencies",
args: args{
Expand Down