@@ -22,7 +22,6 @@ IMG := $(IMAGE_REPO):$(IMAGE_TAG)
2222# Define dependency versions (use go.mod if we also use Go code from dependency)
2323export CERT_MGR_VERSION := v1.9.0
2424export CATALOGD_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)
25- export KAPP_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/vmware-tanzu/carvel-kapp-controller)
2625export RUKPAK_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/rukpak)
2726export WAIT_TIMEOUT := 60s
2827
@@ -166,7 +165,7 @@ kind-load: $(KIND) #EXHELP Loads the currently constructed image onto the cluste
166165kind-deploy : export MANIFEST := ./operator-controller.yaml
167166kind-deploy : manifests $(KUSTOMIZE ) # EXHELP Install controller and dependencies onto the kind cluster.
168167 $(KUSTOMIZE ) build $(KUSTOMIZE_BUILD_DIR ) > operator-controller.yaml
169- envsubst ' $$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$KAPP_VERSION,$$ RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
168+ envsubst ' $$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
170169
171170.PHONY : kind-cluster
172171kind-cluster : $(KIND ) # EXHELP Standup a kind cluster.
@@ -256,7 +255,7 @@ release: $(GORELEASER) #EXHELP Runs goreleaser for the operator-controller. By d
256255quickstart : export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION ) /operator-controller.yaml
257256quickstart : $(KUSTOMIZE ) manifests # EXHELP Generate the installation release manifests and scripts.
258257 $(KUSTOMIZE ) build $(KUSTOMIZE_BUILD_DIR ) | sed " s/:devel/:$( VERSION) /g" > operator-controller.yaml
259- envsubst ' $$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$KAPP_VERSION,$$ RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh
258+ envsubst ' $$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh
260259
261260# #@ Docs
262261
0 commit comments