chore(deps): bump to k8s v1.18

crds/operators.coreos.com_catalogsources.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.8
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: catalogsources.operators.coreos.com
 spec:

crds/operators.coreos.com_installplans.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.8
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: installplans.operators.coreos.com
 spec:

crds/operators.coreos.com_operatorgroups.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.8
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: operatorgroups.operators.coreos.com
 spec:

crds/operators.coreos.com_operators.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.8
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: operators.operators.coreos.com
 spec:

crds/operators.coreos.com_subscriptions.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.8
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: subscriptions.operators.coreos.com
 spec:

go.mod

@@ -3,19 +3,31 @@ module github.com/operator-framework/api
 go 1.13
 
 require (
+	github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
+	github.com/bitly/go-simplejson v0.5.0 // indirect
 	github.com/blang/semver v3.5.0+incompatible
+	github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
+	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
+	github.com/bugsnag/panicwrap v1.2.0 // indirect
+	github.com/garyburd/redigo v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-bindata/go-bindata/v3 v3.1.3
+	github.com/gofrs/uuid v3.2.0+incompatible // indirect
+	github.com/gorilla/handlers v1.4.2 // indirect
 	github.com/mikefarah/yq/v2 v2.4.1
-	github.com/operator-framework/operator-registry v1.5.3
-	github.com/pkg/errors v0.8.1
+	github.com/operator-framework/operator-registry v1.12.1
+	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.5
-	github.com/stretchr/testify v1.4.0
-	k8s.io/api v0.17.3
-	k8s.io/apiextensions-apiserver v0.17.3
-	k8s.io/apimachinery v0.17.3
-	k8s.io/client-go v0.17.3
-	sigs.k8s.io/controller-runtime v0.5.2
-	sigs.k8s.io/controller-tools v0.2.8
+	github.com/spf13/cobra v0.0.6
+	github.com/stretchr/testify v1.5.1
+	github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
+	github.com/yvasiyarov/gorelic v0.0.7 // indirect
+	github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
+	k8s.io/api v0.18.2
+	k8s.io/apiextensions-apiserver v0.18.2
+	k8s.io/apimachinery v0.18.2
+	k8s.io/client-go v0.18.2
+	rsc.io/letsencrypt v0.0.3 // indirect
+	sigs.k8s.io/controller-runtime v0.6.0
+	sigs.k8s.io/controller-tools v0.3.0
 )

pkg/internal/bundle.go

@@ -55,18 +55,23 @@ func (l *manifestsLoad) AddPackageChannels(pkg registry.PackageManifest) error {
 	return nil
 }
 
+// AddBundleSemver is a no-op to implement the registry.Load interface.
+func (l *manifestsLoad) AddBundleSemver(pkg *registry.Package, bundle *registry.Bundle) error {
+	return nil
+}
+
 // AddBundlePackageChannels is a no-op to implement the registry.Load interface.
-func (l *manifestsLoad) AddBundlePackageChannels(manifest registry.PackageManifest, bundle registry.Bundle) error {
+func (*manifestsLoad) AddBundlePackageChannels(registry.PackageManifest, *registry.Bundle) error {
 	return nil
 }
 
-// RmPackageName is a no-op to implement the registry.Load interface.
-func (l *manifestsLoad) RmPackageName(packageName string) error {
+// RmPemoveckageNas a no-op to implement the registry.Load interface.
+func (l *manifestsLoad) RemovePackage(packageName string) error {
 	return nil
 }
 
 // ClearNonDefaultBundles is a no-op to implement the registry.Load interface.
-func (l *manifestsLoad) ClearNonDefaultBundles(packageName string) error {
+func (l *manifestsLoad) ClearNonHeadBundles() error {
 	return nil
 }
 

pkg/validation/internal/bundle_test.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/operator-framework/api/pkg/validation/errors"
 	"github.com/operator-framework/operator-registry/pkg/registry"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -41,7 +40,6 @@ func TestValidateBundle(t *testing.T) {
 	}
 
 	for _, tt := range table {
-		results := []errors.ManifestResult{}
 		unstObjs := []*unstructured.Unstructured{}
 
 		// Read all files in manifests directory
@@ -62,8 +60,8 @@ func TestValidateBundle(t *testing.T) {
 		}
 
 		// Validate the bundle object
-		bundle := registry.NewBundle("test", "", "", unstObjs...)
-		results = BundleValidator.Validate(bundle)
+		bundle := registry.NewBundle("test", "", nil, unstObjs...)
+		results := BundleValidator.Validate(bundle)
 
 		if len(results) > 0 {
 			require.Equal(t, results[0].HasError(), tt.hasError)