From 3bc1fb2cb236f2ebc33fcce6407fb26c038c7d90 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Tue, 30 Nov 2021 15:29:47 -0500 Subject: [PATCH] Work around operator-registry copy issue Use the `operatorhub/catalog_sa` image as the base for the catalog index. The default operatorhub catalog appears to have a root-owned file that causes `opm index add` to fail. See https://github.com/operator-framework/operator-registry/issues/870 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4707128fa..aeb1e3877 100644 --- a/Makefile +++ b/Makefile @@ -216,7 +216,10 @@ CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:$(VERSION) # endif # $(OPM) index add --container-tool $(CONTAINER_ENGINE) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) -CATALOG_INDEX_IMG ?= quay.io/operatorhubio/catalog:latest +# The main multi-arch operatorhub image has a bug that causes opm index add to fail. +# This doesn't seem to be an issue for the single-arch x86 image. +# See https://github.com/operator-framework/operator-registry/issues/870 +CATALOG_INDEX_IMG ?= quay.io/operatorhubio/catalog_sa # Build a catalog image with the operator bundle included .PHONY: catalog-build