Improve script install

Author: camilamacedo86

Makefile

@@ -237,13 +237,14 @@ kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND
 
 .PHONY: kind-deploy
 kind-deploy: export MANIFEST := ./operator-controller.yaml
-kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies, including catalogd, onto the kind cluster.
+kind-deploy: manifests generate-catalogd $(KUSTOMIZE) #EXHELP Install controller and dependencies, including catalogd, onto the kind cluster.
 	$(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) > operator-controller.yaml
 	cd catalogd && $(KUSTOMIZE) build config/overlays/cert-manager > catalogd.yaml
-	envsubst '$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > install.sh
-	bash install.sh \
-		--catalogd-manifest=./catalogd/catalogd.yaml \
-		--default-catalogs-manifest=./catalogd/config/base/default/clustercatalogs/default-catalogs.yaml
+	envsubst '$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh | bash -s
+
+.PHONY: generate-catalogd
+generate-catalogd: ## Generate the catalogd manifests
+	$(MAKE) -C catalogd generate
 
 .PHONY: kind-cluster
 kind-cluster: $(KIND) #EXHELP Standup a kind cluster.

scripts/install.tpl.sh

@@ -19,11 +19,6 @@ if [[ ! -f "$catalogd_manifest" ]]; then
     exit 1
 fi
 
-if [[ ! -f "$default_catalogs_manifest" ]]; then
-    echo "Error: Missing required default catalogs manifest file at $default_catalogs_manifest"
-    exit 1
-fi
-
 if [[ -z "$cert_mgr_version" ]]; then
     echo "Error: Missing CERT_MGR_VERSION variable"
     exit 1
@@ -86,6 +81,11 @@ kubectl_wait_rollout "olmv1-system" "deployment/catalogd-controller-manager" "60
 kubectl_wait "olmv1-system" "deployment/catalogd-controller-manager" "60s"
 
 if [[ "${install_default_catalogs}" != "false" ]]; then
+    if [[ ! -f "$default_catalogs_manifest" ]]; then
+        echo "Error: Missing required default catalogs manifest file at $default_catalogs_manifest"
+        exit 1
+    fi
+
     kubectl apply -f "${default_catalogs_manifest}"
     kubectl wait --for=condition=Serving "clustercatalog/operatorhubio" --timeout="60s"
 fi