Add kuttl-test-ocp target for OpenShift internal registry

Allows running kuttl tests using the OpenShift internal image registry
instead of an external registry like quay.io.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Akrog

Makefile

@@ -42,6 +42,10 @@ CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:$(TAG)
 CATALOG_NAME ?= openstack-lightspeed-catalog
 CATALOG_CHANNEL ?= alpha
 
+# OpenShift internal registry support for local development/testing.
+OCP_REGISTRY_NAMESPACE ?= openstack-lightspeed
+OCP_INTERNAL_REGISTRY ?= image-registry.openshift-image-registry.svc:5000
+
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
 BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(TAG)
@@ -281,6 +285,20 @@ kuttl-test: kuttl ## Run kuttl tests
 .PHONY: kuttl-test-run
 kuttl-test-run: kuttl openstack-lightspeed-deploy kuttl-test openstack-lightspeed-undeploy
 
+.PHONY: ocp-registry-push
+ocp-registry-push: ## Push images to the OpenShift internal registry.
+	bash scripts/ocp-registry-push.sh $(CONTAINER_TOOL) $(OCP_REGISTRY_NAMESPACE) $(IMG) $(CATALOG_IMG)
+
+.PHONY: ocp-catalog-build
+ocp-catalog-build: opm ## Build a catalog image for the OpenShift internal registry.
+	bash scripts/ocp-catalog-build.sh $(CONTAINER_TOOL) $(BUNDLE_IMG) $(CATALOG_IMG) $(OPM)
+
+.PHONY: kuttl-test-ocp
+kuttl-test-ocp: IMG = $(OCP_INTERNAL_REGISTRY)/$(OCP_REGISTRY_NAMESPACE)/operator:latest
+kuttl-test-ocp: BUNDLE_IMG = $(OCP_INTERNAL_REGISTRY)/openshift-marketplace/operator-bundle:$(TAG)
+kuttl-test-ocp: CATALOG_IMG = $(OCP_INTERNAL_REGISTRY)/openshift-marketplace/operator-catalog:$(TAG)
+kuttl-test-ocp: docker-build bundle bundle-build ocp-catalog-build ocp-registry-push kuttl-test-run
+
 # go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
 # $1 - target path with name of binary
 # $2 - package url which can be installed

scripts/ocp-catalog-build.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+# Build a catalog image for use with the OpenShift internal registry.
+#
+# OPM cannot pull bundle images from the internal registry (unreachable from dev machine),
+# so this script:
+# 1. Pushes the bundle to the internal registry via the external route
+# 2. Uses OPM to build the catalog index from the external route (pullable)
+# 3. Fixes the bundlepath in the database to use the internal registry address
+# 4. Builds the final catalog image
+#
+# Usage: ocp-catalog-build.sh <container-tool> <bundle-img> <catalog-img> <opm>
+set -euo pipefail
+
+CONTAINER_TOOL="${1:?Usage: $0 <container-tool> <bundle-img> <catalog-img> <opm>}"
+BUNDLE_IMG="${2:?Usage: $0 <container-tool> <bundle-img> <catalog-img> <opm>}"
+CATALOG_IMG="${3:?Usage: $0 <container-tool> <bundle-img> <catalog-img> <opm>}"
+OPM="${4:?Usage: $0 <container-tool> <bundle-img> <catalog-img> <opm>}"
+
+INTERNAL_PREFIX="image-registry.openshift-image-registry.svc:5000"
+
+echo "==> Ensuring the OpenShift image registry default route is exposed..."
+oc patch configs.imageregistry.operator.openshift.io/cluster \
+  --type merge -p '{"spec":{"defaultRoute":true}}'
+
+ROUTE_HOST="$(oc get route default-route -n openshift-image-registry \
+  -o jsonpath='{.spec.host}')"
+if [ -z "${ROUTE_HOST}" ]; then
+  echo "Error: could not obtain the registry route host."
+  exit 1
+fi
+
+ROUTE_BUNDLE="${BUNDLE_IMG/${INTERNAL_PREFIX}/${ROUTE_HOST}}"
+
+echo "==> Logging in to the registry..."
+${CONTAINER_TOOL} login "${ROUTE_HOST}" -u "$(oc whoami)" -p "$(oc whoami -t)" --tls-verify=false
+
+echo "==> Pushing bundle image to internal registry..."
+${CONTAINER_TOOL} tag "${BUNDLE_IMG}" "${ROUTE_BUNDLE}"
+${CONTAINER_TOOL} push "${ROUTE_BUNDLE}" --tls-verify=false
+${CONTAINER_TOOL} rmi "${ROUTE_BUNDLE}" 2>/dev/null || true
+
+echo "==> Building catalog index from external route..."
+WORKDIR=$(mktemp -d)
+# shellcheck disable=SC2064
+trap "rm -rf ${WORKDIR}" EXIT
+
+${OPM} index add \
+  --build-tool "${CONTAINER_TOOL}" --pull-tool none --skip-tls-verify \
+  --generate --mode semver \
+  --out-dockerfile "${WORKDIR}/index.Dockerfile" \
+  --bundles "${ROUTE_BUNDLE}" \
+  --tag "${CATALOG_IMG}"
+mv database "${WORKDIR}/"
+
+echo "==> Fixing bundle path in catalog database..."
+sqlite3 "${WORKDIR}/database/index.db" \
+  "UPDATE operatorbundle SET bundlepath = REPLACE(bundlepath, '${ROUTE_HOST}', '${INTERNAL_PREFIX}');"
+
+echo "==> Building catalog image..."
+${CONTAINER_TOOL} build -f "${WORKDIR}/index.Dockerfile" -t "${CATALOG_IMG}" "${WORKDIR}"
+
+echo "==> Catalog image built successfully: ${CATALOG_IMG}"

scripts/ocp-registry-push.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+# Push images to the OpenShift internal image registry.
+#
+# Usage: ocp-registry-push.sh <container-tool> <namespace> <image1> [image2 ...]
+#
+# Each <imageN> must use the in-cluster registry address, e.g.:
+#   image-registry.openshift-image-registry.svc:5000/my-ns/my-image:tag
+set -euo pipefail
+
+CONTAINER_TOOL="${1:?Usage: $0 <container-tool> <namespace> <image1> [image2 ...]}"
+NAMESPACE="${2:?Usage: $0 <container-tool> <namespace> <image1> [image2 ...]}"
+shift 2
+
+if [ $# -eq 0 ]; then
+  echo "Error: at least one image must be specified"
+  exit 1
+fi
+
+INTERNAL_PREFIX="image-registry.openshift-image-registry.svc:5000"
+
+echo "==> Ensuring the OpenShift image registry default route is exposed..."
+oc patch configs.imageregistry.operator.openshift.io/cluster \
+  --type merge -p '{"spec":{"defaultRoute":true}}'
+
+echo "==> Obtaining the external registry route..."
+ROUTE_HOST="$(oc get route default-route -n openshift-image-registry \
+  -o jsonpath='{.spec.host}')"
+if [ -z "${ROUTE_HOST}" ]; then
+  echo "Error: could not obtain the registry route host."
+  exit 1
+fi
+echo "    External route: ${ROUTE_HOST}"
+
+echo "==> Ensuring namespace '${NAMESPACE}' exists..."
+oc create namespace "${NAMESPACE}" --dry-run=client -o yaml | oc apply -f -
+
+echo "==> Logging in to the registry..."
+${CONTAINER_TOOL} login "${ROUTE_HOST}" -u "$(oc whoami)" -p "$(oc whoami -t)" --tls-verify=false
+
+for IMAGE in "$@"; do
+  PUSH_IMAGE="${IMAGE/${INTERNAL_PREFIX}/${ROUTE_HOST}}"
+  if [ "${PUSH_IMAGE}" = "${IMAGE}" ]; then
+    echo "Warning: image '${IMAGE}' does not start with '${INTERNAL_PREFIX}', pushing as-is."
+  fi
+
+  echo "==> Pushing ${IMAGE} -> ${PUSH_IMAGE}"
+  ${CONTAINER_TOOL} tag "${IMAGE}" "${PUSH_IMAGE}"
+  ${CONTAINER_TOOL} push "${PUSH_IMAGE}" --tls-verify=false
+  ${CONTAINER_TOOL} rmi "${PUSH_IMAGE}" 2>/dev/null || true
+done
+
+echo "==> All images pushed successfully."