Vendoring

Signed-off-by: Frederic Giloux <fgiloux@redhat.com>

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/onsi/gomega v1.15.0
 	github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
 	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
-	github.com/operator-framework/api v0.12.0
+	github.com/operator-framework/api v0.13.0
 	github.com/operator-framework/operator-registry v1.17.5
 	github.com/otiai10/copy v1.2.0
 	github.com/pkg/errors v0.9.1
@@ -37,7 +37,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20210825183410-e898025ed96a
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
-	google.golang.org/grpc v1.40.0
+	google.golang.org/grpc v1.41.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.6.1
 	k8s.io/api v0.22.2
@@ -85,7 +85,7 @@ require (
 	github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
-	github.com/containerd/containerd v1.4.4 // indirect
+	github.com/containerd/containerd v1.4.11 // indirect
 	github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
 	github.com/containerd/ttrpc v1.0.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
@@ -110,7 +110,6 @@ require (
 	github.com/go-logr/zapr v0.4.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
-	github.com/go-openapi/spec v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gobuffalo/flect v0.2.3 // indirect
@@ -223,14 +222,14 @@ require (
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/cli-runtime v0.21.0 // indirect
+	k8s.io/cli-runtime v0.22.0 // indirect
 	k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
 	k8s.io/klog/v2 v2.9.0 // indirect
-	k8s.io/kubectl v0.21.0 // indirect
+	k8s.io/kubectl v0.22.0 // indirect
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect
-	sigs.k8s.io/kustomize/api v0.8.5 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.10.15 // indirect
+	sigs.k8s.io/kustomize/api v0.8.11 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
@@ -240,6 +239,10 @@ replace (
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20211014063134-be2a7fb8aa44
 	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
 
+	// Temporary for optional manifests before the changes get merged in the API and operator-registry repo
+	// github.com/operator-framework/api v0.11.1 => github.com/fgiloux/api v0.10.8-0.20220118162926-a11336b43231
+	github.com/operator-framework/operator-registry v1.17.5 => github.com/fgiloux/operator-registry v1.19.6-0.20220106160414-aedadf702808
+
 	// Patch for a race condition involving metadata-only
 	// informers until it can be resolved upstream:
 	sigs.k8s.io/controller-runtime v0.10.0 => github.com/timflannagan/controller-runtime v0.10.1-0.20211210161403-6756a4203e70

pkg/controller/operators/catalog/operator.go

@@ -2329,7 +2329,6 @@ func (o *Operator) ExecutePlan(plan *v1alpha1.InstallPlan) error {
 								metav1.StatusReasonConflict:
 								o.logger.WithFields(logrus.Fields{"kind": step.Resource.Kind, "name": step.Resource.Name}).WithError(err).Warnf("Optional manifest could not be created. Optional capabilities of the operator may not be available.")
 								status = v1alpha1.StepStatusNotCreated
-								err = nil
 							default:
 								o.logger.WithFields(logrus.Fields{"kind": step.Resource.Kind, "name": step.Resource.Name}).WithError(err).Warnf("Optional manifest could not be created, possibly due to a recoverable error, retrying")
 								return err

pkg/controller/registry/resolver/steps.go

@@ -189,9 +189,7 @@ func NewStepsFromBundle(bundle *api.Bundle, namespace, replaces, catalogSourceNa
 
 // NewQualifiedStepsFromBundle returns the steps to be populated into the InstallPlan for a bundle
 // Qualified means that steps may have been flaged as optional.
-func NewQualifiedStepsFromBundle(bundle *api.Bundle, filenames []string, namespace, replaces, catalogSourceName, catalogSourceNamespace string,
-	logger *logrus.Logger) ([]*v1alpha1.Step, error) {
-
+func NewQualifiedStepsFromBundle(bundle *api.Bundle, filenames []string, namespace, replaces, catalogSourceName, catalogSourceNamespace string, logger *logrus.Logger) ([]*v1alpha1.Step, error) {
 	bundleSteps, err := NewStepResourceFromBundle(bundle, namespace, replaces, catalogSourceName, catalogSourceNamespace)
 	if err != nil {
 		return nil, err
@@ -220,7 +218,7 @@ func NewQualifiedStepsFromBundle(bundle *api.Bundle, filenames []string, namespa
 		}
 		// CSV should be positioned first
 		if s.Kind == v1alpha1.ClusterServiceVersionKind {
-			steps = append([]*v1alpha1.Step{&v1alpha1.Step{
+			steps = append([]*v1alpha1.Step{{
 				Resolving: bundle.CsvName,
 				Resource:  s,
 				Optional:  optional,

pkg/controller/registry/resolver/steps_test.go

@@ -13,7 +13,6 @@ const (
 )
 
 func TestIsOptional(t *testing.T) {
-
 	type isOptionalTests struct {
 		filenames []string
 		results   []bool
@@ -46,5 +45,4 @@ func TestIsOptional(t *testing.T) {
 			t.Errorf("filename: %s, got %t; want %t", filename, result, ioTests.results[i])
 		}
 	}
-
 }