From 135623debf1832412c0e9e304043c432db4f228d Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Mon, 17 Aug 2020 04:46:38 -0400 Subject: [PATCH] Use fixed operator marketplace tag instead of latest. (#404) Signed-off-by: Oleksandr Andriienko --- olm/olm.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/olm/olm.sh b/olm/olm.sh index 5011f082f5..a079fa5eea 100755 --- a/olm/olm.sh +++ b/olm/olm.sh @@ -115,15 +115,20 @@ EOF marketplaceNamespace="openshift-marketplace"; applyCheOperatorSource else - curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.14.1/install.sh | bash -s 0.14.1 - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/01_namespace.yaml - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/03_operatorsource.crd.yaml - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/04_service_account.yaml - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/05_role.yaml - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/06_role_binding.yaml + OLM_VERSION=0.15.1 + MARKETPLACE_VERSION=4.5 + OPERATOR_MARKETPLACE_VERSION="release-${MARKETPLACE_VERSION}" + curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_VERSION}/install.sh | bash -s ${OLM_VERSION} + kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/01_namespace.yaml + kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/03_operatorsource.crd.yaml + kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/04_service_account.yaml + kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/05_role.yaml + kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/06_role_binding.yaml sleep 1 - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/07_upstream_operatorsource.cr.yaml - kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/release-4.5/deploy/upstream/08_operator.yaml + kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/07_upstream_operatorsource.cr.yaml + curl -sL https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/08_operator.yaml | \ + sed -e "s;quay.io/openshift/origin-operator-marketplace:latest;quay.io/openshift/origin-operator-marketplace:${MARKETPLACE_VERSION};" | \ + kubectl apply -f - applyCheOperatorSource