From 6e3b9e7be42b2ee13d69d1a1219efeca8cc5b847 Mon Sep 17 00:00:00 2001
From: Gorka Eguileor <geguileo@redhat.com>
Date: Tue, 11 Oct 2022 16:05:24 +0200
Subject: [PATCH] Makefile: Support http & insecure registry in opm

In a previous patch we added the USE_TLS environmental variable to our
Makefile to allow pushing to insecure local registries during
development.

This patch extends this functionality to support the catalog building as
well, which is convenient when using the `registry` container image for
local development.

With podman/docker push using the VERIFY_TLS=false will not only disable
the TLS verification but will also allow HTTP connections, which is not
the case of the `opm` command.

The `opm` command has 2 different options `--skip-tls-verify` and
`--use-http`, so we'll use the existing `VERIFY_TLS` for the first and a
new `USE_HTTP` for the second.
---
 Makefile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7e2ab519..f504bf84 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,10 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
 BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
 
+# For podman/docker push and OLM command
 VERIFY_TLS ?= true
+# For OLM command
+USE_HTTP ?= false
 
 # USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
 # You can enable this value if you would like to use SHA Based Digests
@@ -241,7 +244,15 @@ CATALOG_IMG ?= $(IMAGE_TAG_BASE)-index:v$(VERSION)
 
 # Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
 ifneq ($(origin CATALOG_BASE_IMG), undefined)
-FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMG)
+OPM_OPTS := --from-index $(CATALOG_BASE_IMG)
+endif
+
+ifeq (${VERIFY_TSL}, false)
+OPM_OPTS := $(OPM_OPTS) --skip-tls-verify
+endif
+
+ifeq (${USE_HTTP}, true)
+OPM_OPTS := $(OPM_OPTS) --use-http
 endif
 
 # Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
@@ -249,7 +260,7 @@ endif
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
 catalog-build: opm ## Build a catalog image.
-	$(OPM) index add --container-tool podman --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
+	$(OPM) index add --container-tool podman --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(OPM_OPTS)
 
 # Push the catalog image.
 .PHONY: catalog-push