e2e: update extension-developer-e2e to use registry library

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: joelanford

Makefile

@@ -259,18 +259,12 @@ E2E_TIMEOUT ?= 10m
 e2e: #EXHELP Run the e2e tests.
 	go test -count=1 -v ./test/e2e/features_test.go -timeout=$(E2E_TIMEOUT)
 
-E2E_REGISTRY_NAME := docker-registry
-E2E_REGISTRY_NAMESPACE := operator-controller-e2e
-
-export REG_PKG_NAME := registry-operator
-export CLUSTER_REGISTRY_HOST := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000
+export CLUSTER_REGISTRY_HOST := docker-registry.operator-controller-e2e.svc:5000
 export LOCAL_REGISTRY_HOST := localhost:30000
-export E2E_TEST_CATALOG_V1 := e2e/test-catalog:v1
-export E2E_TEST_CATALOG_V2 := e2e/test-catalog:v2
-export CATALOG_IMG := $(CLUSTER_REGISTRY_HOST)/$(E2E_TEST_CATALOG_V1)
 .PHONY: extension-developer-e2e
-extension-developer-e2e: $(OPERATOR_SDK) $(KUSTOMIZE) #EXHELP Run extension create, upgrade and delete tests.
-	test/extension-developer-e2e/setup.sh $(OPERATOR_SDK) $(CONTAINER_RUNTIME) $(KUSTOMIZE) ${LOCAL_REGISTRY_HOST} ${CLUSTER_REGISTRY_HOST}
+extension-developer-e2e: export OPERATOR_SDK := $(OPERATOR_SDK)
+extension-developer-e2e: export CONTAINER_RUNTIME := $(CONTAINER_RUNTIME)
+extension-developer-e2e: $(OPERATOR_SDK) #EXHELP Run extension create, upgrade and delete tests.
 	go test -count=1 -v ./test/extension-developer-e2e/...
 
 UNIT_TEST_DIRS := $(shell go list ./... | grep -vE "/test/|/testutils") $(shell go list ./test/internal/...)
@@ -298,15 +292,6 @@ test-regression: #HELP Run regression test
 	rm -rf $(COVERAGE_REGRESSION_DIR) && mkdir -p $(COVERAGE_REGRESSION_DIR)
 	go test -count=1 -v ./test/regression/... -cover -coverprofile ${ROOT_DIR}/coverage/regression.out -test.gocoverdir=$(COVERAGE_REGRESSION_DIR)
 
-.PHONY: image-registry
-E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
-image-registry: export GOOS=linux
-image-registry: export GOARCH=amd64
-image-registry: ## Build the testdata catalog used for e2e tests and push it to the image registry
-	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push         ./testdata/push/push.go
-	$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
-	$(KIND) load docker-image $(E2E_REGISTRY_IMAGE) --name $(KIND_CLUSTER_NAME)
-	./testdata/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
 
 # When running the e2e suite, you can set the ARTIFACT_PATH variable to the absolute path
 # of the directory for the operator-controller e2e tests to store the artifacts, which
@@ -349,7 +334,7 @@ test-extension-developer-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)
 test-extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e
 test-extension-developer-e2e: export INSTALL_DEFAULT_CATALOGS := false
 test-extension-developer-e2e: export MANIFEST := $(STANDARD_RELEASE_MANIFEST)
-test-extension-developer-e2e: run-internal image-registry extension-developer-e2e kind-clean #HELP Run extension-developer e2e on local kind cluster
+test-extension-developer-e2e: run-internal extension-developer-e2e kind-clean #HELP Run extension-developer e2e on local kind cluster
 
 .PHONY: run-latest-release
 run-latest-release:

test/extension-developer-e2e/extension_developer_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"os/exec"
 	"testing"
 	"time"
 
@@ -19,22 +20,49 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
+	testregistry "github.com/operator-framework/operator-controller/test/internal/registry"
 )
 
+const (
+	catalogTag = "e2e/test-catalog:v1"
+	regPkgName = "registry-operator"
+)
+
+func TestMain(m *testing.M) {
+	cfg := ctrl.GetConfigOrDie()
+	if err := testregistry.Deploy(context.Background(), cfg, testregistry.DefaultNamespace, testregistry.DefaultName); err != nil {
+		panic(fmt.Sprintf("failed to deploy image registry: %v", err))
+	}
+
+	clusterRegistryHost := os.Getenv("CLUSTER_REGISTRY_HOST")
+	if clusterRegistryHost == "" {
+		panic("CLUSTER_REGISTRY_HOST environment variable must be set")
+	}
+
+	// Set env vars for setup.sh — single source of truth
+	os.Setenv("CATALOG_TAG", catalogTag)
+	os.Setenv("REG_PKG_NAME", regPkgName)
+
+	cmd := exec.Command("./setup.sh") //nolint:gosec // test-only setup script
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		panic(fmt.Sprintf("failed to run setup.sh: %v", err))
+	}
+
+	os.Exit(m.Run())
+}
+
 func TestExtensionDeveloper(t *testing.T) {
 	t.Parallel()
 	cfg := ctrl.GetConfigOrDie()
 
 	scheme := runtime.NewScheme()
 
-	require.NoError(t, ocv1.AddToScheme(scheme))
 	require.NoError(t, ocv1.AddToScheme(scheme))
 	require.NoError(t, corev1.AddToScheme(scheme))
 	require.NoError(t, rbacv1.AddToScheme(scheme))
 
-	require.NotEmpty(t, os.Getenv("CATALOG_IMG"), "environment variable CATALOG_IMG must be set")
-	require.NotEmpty(t, os.Getenv("REG_PKG_NAME"), "environment variable REG_PKG_NAME must be set")
-
 	c, err := client.New(cfg, client.Options{Scheme: scheme})
 	require.NoError(t, err)
 
@@ -48,7 +76,7 @@ func TestExtensionDeveloper(t *testing.T) {
 			Source: ocv1.CatalogSource{
 				Type: ocv1.SourceTypeImage,
 				Image: &ocv1.ImageSource{
-					Ref: os.Getenv("CATALOG_IMG"),
+					Ref: os.Getenv("CLUSTER_REGISTRY_HOST") + "/" + catalogTag,
 				},
 			},
 		},
@@ -73,7 +101,7 @@ func TestExtensionDeveloper(t *testing.T) {
 			Source: ocv1.SourceConfig{
 				SourceType: "Catalog",
 				Catalog: &ocv1.CatalogFilter{
-					PackageName: os.Getenv("REG_PKG_NAME"),
+					PackageName: regPkgName,
 				},
 			},
 			Namespace: installNamespace,

test/extension-developer-e2e/setup.sh

@@ -11,35 +11,28 @@ following bundle formats:
 This script will ensure that all images built are loaded onto
 a KinD cluster with the name specified in the arguments.
 The following environment variables are required for configuring this script:
-- \$E2E_TEST_CATALOG_V1 - the tag for the catalog image that contains the registry+v1 bundle.
-- \$REG_PKG_NAME - the name of the package for the extension that uses the registry+v1 bundle format.
-setup.sh also takes 5 arguments.
+- \$OPERATOR_SDK - path to the operator-sdk binary.
+- \$CONTAINER_RUNTIME - container runtime to use (e.g. docker, podman).
+- \$LOCAL_REGISTRY_HOST - registry address accessible from the test process.
+- \$CLUSTER_REGISTRY_HOST - registry address accessible from inside the cluster.
+- \$CATALOG_TAG - OCI tag for the catalog image (e.g. e2e/test-catalog:v1).
+- \$REG_PKG_NAME - the name of the package for the extension.
 
 Usage:
-  setup.sh [OPERATOR_SDK] [CONTAINER_RUNTIME] [KUSTOMIZE] [LOCAL_REGISTRY_HOST] [CLUSTER_REGISTRY_HOST]
+  setup.sh
 "
 
 ########################################
 # Input validation
 ########################################
 
-if [[ "$#" -ne 5 ]]; then
-  echo "Illegal number of arguments passed"
-  echo "${help}"
-  exit 1
-fi
-
-if [[ -z "${E2E_TEST_CATALOG_V1}" ]]; then
-  echo "\$E2E_TEST_CATALOG_V1 is required to be set"
-  echo "${help}"
-  exit 1
-fi
-
-if [[ -z "${REG_PKG_NAME}" ]]; then
-  echo "\$REG_PKG_NAME is required to be set"
-  echo "${help}"
-  exit 1
-fi
+for var in OPERATOR_SDK CONTAINER_RUNTIME LOCAL_REGISTRY_HOST CLUSTER_REGISTRY_HOST CATALOG_TAG REG_PKG_NAME; do
+  if [[ -z "${!var:-}" ]]; then
+    echo "\$$var is required to be set"
+    echo "${help}"
+    exit 1
+  fi
+done
 
 ########################################
 # Setup temp dir and local variables
@@ -54,21 +47,20 @@ DOMAIN=oc-opdev-e2e.operatorframework.io
 REG_DIR="${TMP_ROOT}/registry"
 mkdir -p "${REG_DIR}"
 
-operator_sdk=$1
-container_tool=$2
-kustomize=$3
+operator_sdk="${OPERATOR_SDK}"
+container_tool="${CONTAINER_RUNTIME}"
 # The path we use to push the image from _outside_ the cluster
-local_registry_host=$4
+local_registry_host="${LOCAL_REGISTRY_HOST}"
 # The path we use _inside_ the cluster
-cluster_registry_host=$5
+cluster_registry_host="${CLUSTER_REGISTRY_HOST}"
 
 tls_flag=""
 if [[ "$container_tool" == "podman" ]]; then
   echo "Using podman container runtime; adding tls disable flag"
   tls_flag="--tls-verify=false"
 fi
 
-catalog_push_tag="${local_registry_host}/${E2E_TEST_CATALOG_V1}"
+catalog_push_tag="${local_registry_host}/${CATALOG_TAG}"
 reg_pkg_name="${REG_PKG_NAME}"
 
 reg_img="${DOMAIN}/registry:v0.0.1"
@@ -102,6 +94,7 @@ reg_bundle_push_tag="${local_registry_host}/${reg_bundle_path}"
     --resource --controller && \
   export OPERATOR_SDK="${operator_sdk}" && \
   make generate manifests && \
+  sed -i -e 's/$(CONTAINER_TOOL) build/$(CONTAINER_TOOL) build --provenance=false/' Makefile && \
   make docker-build IMG="${reg_img}" && \
   sed -i -e 's/$(OPERATOR_SDK) generate kustomize manifests -q/$(OPERATOR_SDK) generate kustomize manifests -q --interactive=false/g' Makefile && \
   make bundle IMG="${reg_img}" VERSION=0.0.1 && \
@@ -153,5 +146,5 @@ cat <<EOF > "${TMP_ROOT}"/catalog/index.yaml
 }
 EOF
 
-${container_tool} build -f "${TMP_ROOT}/catalog.Dockerfile" -t "${catalog_push_tag}" "${TMP_ROOT}/"
+${container_tool} build --provenance=false -f "${TMP_ROOT}/catalog.Dockerfile" -t "${catalog_push_tag}" "${TMP_ROOT}/"
 ${container_tool} push ${catalog_push_tag} ${tls_flag}