From ca591ed9203c214b0156db228ba41cd4efe554f7 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Fri, 22 May 2020 15:40:03 -0400 Subject: [PATCH] Test presence of OLM by CSV resource instead of op-sdk --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b55d9b3dc..75d1e6ba9 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ deploy: install-olm deploy-hub deploy-spoke clean-deploy: clean-spoke clean-hub install-olm: ensure-operator-sdk - $(OPERATOR_SDK) olm status --olm-namespace $(OLM_NAMESPACE) ; if [ $$? -ne 0 ] ; then $(OPERATOR_SDK) olm install --version 0.14.1 ; fi + $(KUBECTL) get crds | grep clusterserviceversion ; if [ $$? -ne 0 ] ; then $(OPERATOR_SDK) olm install --version 0.14.1 --olm-namespace $(OLM_NAMESPACE); fi $(KUBECTL) get ns open-cluster-management ; if [ $$? -ne 0 ] ; then $(KUBECTL) create ns open-cluster-management ; fi deploy-hub: install-olm