From 69e605d6d167568ea00303a13bce4a30667b885d Mon Sep 17 00:00:00 2001 From: Tayler Geiger Date: Wed, 24 Jul 2024 11:41:49 -0500 Subject: [PATCH] Install default-catalogs from Catalogd release Note: setup.sh for extension-developer-e2e now removes the OperatorHub clustercatalog so it doesn't interfere with testing. Signed-off-by: Tayler Geiger --- scripts/install.tpl.sh | 3 +++ test/extension-developer-e2e/setup.sh | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/scripts/install.tpl.sh b/scripts/install.tpl.sh index 1b44ac630..5e15ee84a 100644 --- a/scripts/install.tpl.sh +++ b/scripts/install.tpl.sh @@ -38,5 +38,8 @@ kubectl_wait "cert-manager" "deployment/cert-manager-webhook" "60s" kubectl apply -f "https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/catalogd.yaml" kubectl_wait "olmv1-system" "deployment/catalogd-controller-manager" "60s" +kubectl apply -f "https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/default-catalogs.yaml" +kubectl wait --for=condition=Unpacked "clustercatalog/operatorhubio" --timeout="60s" + kubectl apply -f "${operator_controller_manifest}" kubectl_wait "olmv1-system" "deployment/operator-controller-controller-manager" "60s" diff --git a/test/extension-developer-e2e/setup.sh b/test/extension-developer-e2e/setup.sh index 889080ad6..a76dabaad 100755 --- a/test/extension-developer-e2e/setup.sh +++ b/test/extension-developer-e2e/setup.sh @@ -74,6 +74,15 @@ reg_bundle_img="${LOCAL_REGISTRY_HOST}/bundles/registry-v1/registry-bundle:v0.0. catalog_img="${CATALOG_IMG}" reg_pkg_name="${REG_PKG_NAME}" + +######################################## +# Remove the default OperatorHub.io +# ClusterCatalog +######################################## + +# We only want to worry about the test catalogs +kubectl delete clustercatalog operatorhubio + ######################################## # Create the registry+v1 based extension # and build + load images