Drop csv-merger

This commit drops the csv-merger as it was no longer in
use for merging CSV's and only used to merge in ENV
variables from the service operators.

Maintain those ENVs in the openstack-operator will mean that each time
an openstack-operator bundle is generated the associated
SHA's for service containers will be pinned to a new version
and thus decoupled from the service operators themselves.

.github/workflows/build-openstack-operator.yaml

@@ -17,7 +17,7 @@ jobs:
       operator_name: openstack
       go_version: 1.20.x
       operator_sdk_version: 1.31.0
-      bundle_dockerfile: ./custom-bundle.Dockerfile
+      bundle_dockerfile: ./bundle.Dockerfile
       catalog_extra_bundles_script: ./hack/pin-bundle-images.sh
     secrets:
       IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }}

.prow_ci.env

@@ -1,3 +1,3 @@
 export USE_IMAGE_DIGESTS=true
-export BUNDLE_DOCKERFILE=custom-bundle.Dockerfile
+export BUNDLE_DOCKERFILE=bundle.Dockerfile
 export FAIL_FIPS_CHECK=true

Makefile

@@ -189,7 +189,6 @@ cover: test ## Run tests and display functional test coverage
 .PHONY: build
 build: generate fmt vet ## Build manager binary.
 	go build -o bin/manager main.go
-	go build -o bin/csv-merger cmd/csv-merger/csv-merger.go
 
 .PHONY: run
 run: export METRICS_PORT?=8080
@@ -330,7 +329,7 @@ endif
 endif
 
 .PHONY: bundle
-bundle: build manifests kustomize bundle-cache-extra-data operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
+bundle: build manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
@@ -339,7 +338,7 @@ bundle: build manifests kustomize bundle-cache-extra-data operator-sdk ## Genera
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.
-	podman build -f custom-bundle.Dockerfile -t $(BUNDLE_IMG) .
+	podman build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
@@ -469,10 +468,3 @@ run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
 .PHONY: webhook-cleanup
 webhook-cleanup:
 	/bin/bash hack/clean_local_webhook.sh
-
-# refresh the bundle extra data based on go.mod entries
-# bundle extra data includes:
-#  - extracted ENV vars from all operators (required for webhooks)
-.PHONY: bundle-cache-extra-data
-bundle-cache-extra-data: build
-	bash hack/bundle-cache-data.sh

README.md

@@ -69,7 +69,7 @@ bundle.
 make dep-bundle-build-push
 ```
 
-3. Run bundle-build. This will execute podman to build the custom-bundle.Dockerfile.
+3. Run bundle-build. This will execute podman to build the bundle.Dockerfile.
 
 ```sh
 make bundle-build