Skip to content

Commit

Permalink
MGMT-16164: Install 4.14 redhat-operators catalog for LSO (#5669)
Browse files Browse the repository at this point in the history
  • Loading branch information
danmanor committed Nov 7, 2023
1 parent 08e3d8f commit 8eca4e2
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions deploy/operator/setup_lso.sh
Expand Up @@ -23,22 +23,22 @@ function install_lso() {
catalog_source_name="redhat-operators"

OC_VERSION_MAJOR_MINOR=$(oc version -o json | jq --raw-output '.openshiftVersion' | cut -d'.' -f1-2)
if [[ ${OC_VERSION_MAJOR_MINOR} == "4.14" && "${DISCONNECTED}" != true ]]; then
# LSO has not been published to the 4.14 redhat-operators catalog, so
# it cannot be installed on OpenShift 4.14. Until this is resolved,
# we explicitly install the 4.13 catalog as redhat-operators-v4-13
# and then subscribe to the LSO version from the 4.13 rather than the 4.14 catalog.
if [[ ${OC_VERSION_MAJOR_MINOR} == "4.15" && "${DISCONNECTED}" != true ]]; then
# LSO has not been published to the 4.15 redhat-operators catalog, so
# it cannot be installed on OpenShift 4.15. Until this is resolved,
# we explicitly install the 4.13 catalog as redhat-operators-v4-14
# and then subscribe to the LSO version from the 4.14 rather than the 4.15 catalog.
# TODO: Bump the versions once LSO is published to the 4.14 catalog.
catalog_source_name="redhat-operators-v4-13"
catalog_source_name="redhat-operators-v4-14"
tee << EOCR >(oc apply -f -)
kind: CatalogSource
apiVersion: operators.coreos.com/v1alpha1
metadata:
name: redhat-operators-v4-13
name: redhat-operators-v4-14
namespace: openshift-marketplace
spec:
displayName: Red Hat Operators v4.13
image: registry.redhat.io/redhat/redhat-operator-index:v4.13
displayName: Red Hat Operators v4.14
image: registry.redhat.io/redhat/redhat-operator-index:v4.14
priority: -100
publisher: Red Hat
sourceType: grpc
Expand Down

0 comments on commit 8eca4e2

Please sign in to comment.