diff --git a/go.mod b/go.mod index 5aee63877..64ed7b500 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/operator-framework/api v0.26.0 - github.com/operator-framework/catalogd v0.19.0 + github.com/operator-framework/catalogd v0.20.0 github.com/operator-framework/helm-operator-plugins v0.3.1 github.com/operator-framework/operator-registry v1.45.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index a8bb6aa5c..f9b2bfd4e 100644 --- a/go.sum +++ b/go.sum @@ -588,8 +588,8 @@ github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eT github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o= github.com/operator-framework/api v0.26.0 h1:YVntU2NkVl5zSLLwK5kFcH6P3oSvN9QDgTsY9mb4yUM= github.com/operator-framework/api v0.26.0/go.mod h1:3IxOwzVUeGxYlzfwKCcfCyS+q3EEhWA/4kv7UehbeyM= -github.com/operator-framework/catalogd v0.19.0 h1:Yb2Oz7o4jSPRp4R349h5uDI+z1cO/CNkH8z7jLPGuVo= -github.com/operator-framework/catalogd v0.19.0/go.mod h1:F4KehkAI/bpDI4IVXNxQ7dlWtVBYvc2qkxSa7mIFGRk= +github.com/operator-framework/catalogd v0.20.0 h1:m5ugxf9fjEUaNHy81lSu6jFzTEt0XpEo44+T7g9On+U= +github.com/operator-framework/catalogd v0.20.0/go.mod h1:F4KehkAI/bpDI4IVXNxQ7dlWtVBYvc2qkxSa7mIFGRk= github.com/operator-framework/helm-operator-plugins v0.3.1 h1:D8hF0ufF+2ZtuttYUu4yBlsmHvic/zENm6n9h83ITI0= github.com/operator-framework/helm-operator-plugins v0.3.1/go.mod h1:5Kx1PyLnRVPyQmLq+frv+HJgSZzXG+W6LavSCxzm8sI= github.com/operator-framework/operator-lib v0.14.0 h1:er+BgZymZD1im2wytLJiPLZpGALAX6N0gXaHx3PKbO4= 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"