Skip to content

Commit

Permalink
Merge pull request #2221 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…2211-to-v0.18.x

[v0.18.x] install.sh should not abort if openshift olm is not installed
  • Loading branch information
openshift-merge-robot authored Jun 29, 2021
2 parents f033e4e + 0fc57e0 commit d53ec82
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ if [[ ${#@} -lt 1 || ${#@} -gt 2 ]]; then
exit 1
fi

kubectl get deployment olm-operator -n openshift-operator-lifecycle-manager -o=jsonpath='{.spec}' > /dev/null 2>&1
if [[ $? -eq 0 ]]; then
if kubectl get deployment olm-operator -n openshift-operator-lifecycle-manager -o=jsonpath='{.spec}' > /dev/null 2>&1; then
echo "OLM is already installed in a different configuration. This is common if you are not running a vanilla Kubernetes cluster. Exiting..."
exit 1
fi
Expand Down

0 comments on commit d53ec82

Please sign in to comment.