Fix install script

Author: camilamacedo86

.gitignore

@@ -21,6 +21,7 @@ coverage
 # Release output
 dist/**
 operator-controller.yaml
+olmv1.yaml
 install.sh
 
 # Kubernetes Generated files - skip generated files, except for vendored files

Makefile

@@ -23,7 +23,6 @@ IMG := $(IMAGE_REPO):$(IMAGE_TAG)
 
 # Define dependency versions (use go.mod if we also use Go code from dependency)
 export CERT_MGR_VERSION := v1.15.3
-export CATALOGD_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)
 export WAIT_TIMEOUT := 60s
 
 # Install default ClusterCatalogs
@@ -228,15 +227,20 @@ test-upgrade-e2e: kind-cluster run-latest-release image-registry pre-upgrade-set
 e2e-coverage:
 	COVERAGE_OUTPUT=./coverage/e2e.out ./hack/test/e2e-coverage.sh
 
-.PHONY: kind-load
-kind-load: $(KIND) #EXHELP Loads the currently constructed image onto the cluster.
+kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND cluster.
 	$(CONTAINER_RUNTIME) save $(IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
+	$(CONTAINER_RUNTIME) save quay.io/operator-framework/catalogd:devel | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 
 .PHONY: kind-deploy
-kind-deploy: export MANIFEST="./operator-controller.yaml"
-kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies onto the kind cluster.
-	$(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) > operator-controller.yaml
-	envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh | bash -s
+kind-deploy: export MANIFEST := ./olmv1.yaml
+kind-deploy: manifests generate-catalogd $(KUSTOMIZE)
+	($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build catalogd/config/overlays/cert-manager | sed "s/cert-git-version/cert-$(VERSION)/g") > $(MANIFEST)
+	envsubst '$$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.
@@ -293,9 +297,25 @@ go-build-linux: $(BINARIES)
 run: docker-build kind-cluster kind-load kind-deploy #HELP Build the operator-controller then deploy it into a new kind cluster.
 
 .PHONY: docker-build
-docker-build: build-linux #EXHELP Build docker image for operator-controller with GOOS=linux and local GOARCH.
+docker-build: build-linux build-catalogd #EXHELP Build docker image for operator-controller with GOOS=linux and local GOARCH.
 	$(CONTAINER_RUNTIME) build -t $(IMG) -f Dockerfile ./bin/linux
 
+ifeq ($(origin IMAGE_CATALOG_REPO), undefined)
+IMAGE_REPO := quay.io/operator-framework/catalogd
+endif
+export IMAGE_REPO
+
+ifeq ($(origin IMAGE_CATALOG_TAG), undefined)
+IMAGE_TAG := devel
+endif
+export IMAGE_TAG
+
+IMAGE_CATALOG := $(IMAGE_CATALOG_REPO):$(IMAGE_TAG)
+
+.PHONY: build-catalogd
+build-catalogd: ## Build the catalogd image
+	IMAGE=$(IMAGE_CATALOG) $(MAKE) -C catalogd build-container
+
 #SECTION Release
 ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)
 ENABLE_RELEASE_PIPELINE := false
@@ -312,10 +332,10 @@ release: $(GORELEASER) #EXHELP Runs goreleaser for the operator-controller. By d
 	$(GORELEASER) $(GORELEASER_ARGS)
 
 .PHONY: quickstart
-quickstart: export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml
-quickstart: $(KUSTOMIZE) manifests #EXHELP Generate the installation release manifests and scripts.
-	$(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) | sed "s/:devel/:$(VERSION)/g" > operator-controller.yaml
-	envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > install.sh
+quickstart: export MANIFEST := ./olmv1.yaml
+quickstart: $(KUSTOMIZE) manifests build-catalogd #EXHELP Generate the unified installation release manifests and scripts.
+	($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build catalogd/config/overlays/cert-manager | sed "s/cert-git-version/cert-$(VERSION)/g") > $(MANIFEST)
+	envsubst '$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > install.sh
 
 ##@ Docs
 

catalogd/Makefile

@@ -3,8 +3,6 @@
 SHELL := /usr/bin/env bash -o pipefail
 .SHELLFLAGS := -ec
 
-GOLANG_VERSION := $(shell sed -En 's/^go (.*)$$/\1/p' "go.mod")
-
 ifeq ($(origin IMAGE_REPO), undefined)
 IMAGE_REPO := quay.io/operator-framework/catalogd
 endif

scripts/install.tpl.sh

@@ -2,26 +2,19 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-operator_controller_manifest=$MANIFEST
+olmv1_manifest=$MANIFEST
 
-if [[ -z "$operator_controller_manifest" ]]; then
+if [[ -z "$olmv1_manifest" ]]; then
     echo "Error: Missing required MANIFEST variable"
     exit 1
 fi
 
-catalogd_version=$CATALOGD_VERSION
+default_catalogs_manifest="./catalogd/config/base/default/clustercatalogs/default-catalogs.yaml"
 cert_mgr_version=$CERT_MGR_VERSION
 install_default_catalogs=$INSTALL_DEFAULT_CATALOGS
 
-if [[ -z "$catalogd_version" || -z "$cert_mgr_version" ]]; then
-    err="Error: Missing component version(s) for: "
-    if [[ -z "$catalogd_version" ]]; then
-        err+="catalogd "
-    fi 
-    if [[ -z "$cert_mgr_version" ]]; then
-        err+="cert-manager "
-    fi
-    echo "$err"
+if [[ -z "$cert_mgr_version" ]]; then
+    echo "Error: Missing CERT_MGR_VERSION variable"
     exit 1
 fi
 
@@ -76,15 +69,18 @@ kubectl_wait "cert-manager" "deployment/cert-manager" "60s"
 kubectl_wait_for_query "mutatingwebhookconfigurations/cert-manager-webhook" '{.webhooks[0].clientConfig.caBundle}' 60 5
 kubectl_wait_for_query "validatingwebhookconfigurations/cert-manager-webhook" '{.webhooks[0].clientConfig.caBundle}' 60 5
 
-kubectl apply -f "https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/catalogd.yaml"
+kubectl apply -f "${olmv1_manifest}"
 # Wait for the rollout, and then wait for the deployment to be Available
 kubectl_wait_rollout "olmv1-system" "deployment/catalogd-controller-manager" "60s"
 kubectl_wait "olmv1-system" "deployment/catalogd-controller-manager" "60s"
+kubectl_wait "olmv1-system" "deployment/operator-controller-controller-manager" "60s"
 
 if [[ "${install_default_catalogs}" != "false" ]]; then
-    kubectl apply -f "https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/default-catalogs.yaml"
+    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
-
-kubectl apply -f "${operator_controller_manifest}"
-kubectl_wait "olmv1-system" "deployment/operator-controller-controller-manager" "60s"