Skip to content

Commit

Permalink
Work around operator-registry copy issue
Browse files Browse the repository at this point in the history
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 operator-framework/operator-registry#870
  • Loading branch information
adambkaplan committed Dec 2, 2021
1 parent 28d961a commit 3351c63
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3351c63

Please sign in to comment.