csv-merger: merge relatedImages

[dprince]

We need to merge in relatedImages from the dataplane-operator

Also drops the extendedCsv struct as it is no longer needed

[abays]

This seems to pass CI, but it fails to build for me locally:

$ IMAGE_TAG_BASE=quay.io/andrewbays/openstack-operator VERSION=0.0.1 IMG=$IMAGE_TAG_BASE:v$VERSION make manifests build docker-build docker-push bundle bundle-build bundle-push catalog-build catalog-push

...

INFO[0004] Creating bundle.Dockerfile                   
INFO[0004] Creating bundle/metadata/annotations.yaml    
INFO[0004] Bundle metadata generated successfully       
operator-sdk bundle validate ./bundle
ERRO[0000] Error: Value client.openstack.org/v1beta1, Kind=OpenStackClient: CRD "client.openstack.org/v1beta1, Kind=OpenStackClient" is present in bundle "openstack-operator.v0.0.1" but not defined in CSV
...

Might just be something peculiar to my environment.

[dprince]

This seems to pass CI, but it fails to build for me locally:

$ IMAGE_TAG_BASE=quay.io/andrewbays/openstack-operator VERSION=0.0.1 IMG=$IMAGE_TAG_BASE:v$VERSION make manifests build docker-build docker-push bundle bundle-build bundle-push catalog-build catalog-push

...

INFO[0004] Creating bundle.Dockerfile                   
INFO[0004] Creating bundle/metadata/annotations.yaml    
INFO[0004] Bundle metadata generated successfully       
operator-sdk bundle validate ./bundle
ERRO[0000] Error: Value client.openstack.org/v1beta1, Kind=OpenStackClient: CRD "client.openstack.org/v1beta1, Kind=OpenStackClient" is present in bundle "openstack-operator.v0.0.1" but not defined in CSV
...

Might just be something peculiar to my environment.

I tried the bundle validate with operator-sdk 1.31 and it seems fine. Is it an older version in your environment? (we don't technically require 1.31 yet but soon will)

[dprince]

/test openstack-operator-build-deploy-kuttl

[dprince]

/test openstack-operator-build-deploy-kuttl

[abays]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, dprince

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [abays,dprince]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment