Change to file-based catalog image

Signed-off-by: Yi Rae Kim <[email protected]>

.github/workflows/olm_tests.yaml

@@ -42,7 +42,7 @@ jobs:
         # TODO: Use operator-sdk run bundle and bundle-upgrade commands for
         # testing with OLM.
         OPERATOR_VERSION=$(awk '/^VERSION \?=/ {print $3}' Makefile)
-        REPO=localhost:5000
+        REPO=http://localhost:5000
         IMG=${REPO}/gatekeeper-operator:${GITHUB_SHA}
         PREV_BUNDLE_INDEX_IMG=quay.io/gatekeeper/gatekeeper-operator-bundle-index:$(make get-replaces-version)
         make build-and-push-bundle-images IMG=${IMG} REPO=${REPO} VERSION=${GITHUB_SHA} OPERATOR_VERSION=${OPERATOR_VERSION}

Makefile

@@ -21,6 +21,8 @@ ifeq ($(GOOS), darwin)
   SED="gsed"
 endif
 
+OPERATOR_NAME=gatekeeper-operator
+
 get-replaces-version:
 	@echo $(REPLACES_VERSION)
 
@@ -52,7 +54,7 @@ DOCKER ?= docker
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # gatekeeper.sh/gatekeeper-operator-bundle:$VERSION and gatekeeper.sh/gatekeeper-operator-catalog:$VERSION.
-REPO ?= quay.io/gatekeeper
+REPO ?= localhost:5000
 IMAGE_TAG_BASE ?= $(REPO)/gatekeeper-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
@@ -109,7 +111,7 @@ ENVTEST = $(LOCAL_BIN)/setup-envtest
 GO_BINDATA = $(LOCAL_BIN)/go-bindata
 GINKGO = $(LOCAL_BIN)/ginkgo
 KUSTOMIZE_VERSION ?= v5.0.1
-OPM_VERSION ?= v1.27.0
+OPM_VERSION ?= v1.31.0
 GO_BINDATA_VERSION ?= v3.1.2+incompatible
 BATS_VERSION ?= 1.2.1
 OLM_VERSION ?= v0.25.0
@@ -362,15 +364,19 @@ import-manifests: kustomize
 .PHONY: bundle-index-build
 bundle-index-build: opm
 ifneq ($(REPLACES_VERSION), none)
-	$(OPM) index add --bundles $(BUNDLE_IMG) --from-index $(PREV_BUNDLE_INDEX_IMG) --tag $(BUNDLE_INDEX_IMG) -c $(DOCKER)
+	-rm catalog_dir.dockerfile
+	-$(OPM) generate dockerfile catalog_dir
+	$(OPM) init $(OPERATOR_NAME) --default-channel=stable --description=./README.md --output --icon=./gatekeeper_logo.svg  --output yaml > catalog_dir/index.yaml
+	$(OPM) render $(BUNDLE_IMG)  --output=yaml >> catalog_dir/index.yaml --use-http
+	$(DOCKER) build . -f catalog_dir.Dockerfile -t $(BUNDLE_INDEX_IMG)
 else
 	$(OPM) index add --bundles $(BUNDLE_IMG) --tag $(BUNDLE_INDEX_IMG) -c $(DOCKER)
 endif
 
 # Generate and push bundle image and bundle index image
 # Note: OPERATOR_VERSION is an arbitrary number and does not need to match any official versions
 .PHONY: build-and-push-bundle-images
-build-and-push-bundle-images: docker-build docker-push
+build-and-push-bundle-images: # docker-build docker-push
 	$(MAKE) bundle VERSION=$(OPERATOR_VERSION)
 	$(MAKE) bundle-build
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)

bundle/manifests/gatekeeper-operator.clusterserviceversion.yaml

@@ -378,7 +378,7 @@ spec:
                 env:
                 - name: RELATED_IMAGE_GATEKEEPER
                   value: openpolicyagent/gatekeeper:v3.11.1
-                image: quay.io/gatekeeper/gatekeeper-operator:v3.11.1
+                image: localhost:5000/gatekeeper-operator:v3.11.1
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:

catalog_dir/channel.yaml

@@ -0,0 +1,6 @@
+---
+schema: olm.channel
+package: gatekeeper-operator
+name: stable
+entries:
+- name: gatekeeper-operator.v3.11.1

config/manager/kustomization.yaml

@@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/gatekeeper/gatekeeper-operator
+  newName: localhost:5000/gatekeeper-operator
   newTag: v3.11.1