diff --git a/docs/changelog.md b/docs/changelog.md index a0ceab3..bf05c23 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,7 +2,13 @@ All notable changes to this project will be documented in this file. -## [1.1.25] - Current +## [1.1.26] - Current + +### Fixed + +- **OSL operator switched to stable/logic-operator**: Switched from `alpha`/`logic-operator-rhel8` (legacy pre-1.37 package) to `stable`/`logic-operator` (GA package), matching the OS operator channel and avoiding version skew that caused Knative API incompatibilities. + +## [1.1.25] ### Added diff --git a/package.json b/package.json index 94b19c0..c7c3905 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@red-hat-developer-hub/e2e-test-utils", - "version": "1.1.25", + "version": "1.1.26", "description": "Test utilities for RHDH E2E tests", "license": "Apache-2.0", "repository": { diff --git a/src/deployment/orchestrator/install-orchestrator.sh b/src/deployment/orchestrator/install-orchestrator.sh index 086f06a..fb27c35 100755 --- a/src/deployment/orchestrator/install-orchestrator.sh +++ b/src/deployment/orchestrator/install-orchestrator.sh @@ -105,7 +105,9 @@ log::success() { # Operator subscription and status # --------------------------------------------------------------------------- install_subscription() { - local name=$1 namespace=$2 channel=$3 package=$4 source_name=$5 source_namespace=$6 + local name=$1 namespace=$2 channel=$3 package=$4 source_name=$5 source_namespace=$6 starting_csv=${7:-} + local spec_extra="" + [[ -n "$starting_csv" ]] && spec_extra=" startingCSV: $starting_csv" oc apply -f - << EOD apiVersion: operators.coreos.com/v1alpha1 kind: Subscription @@ -118,6 +120,7 @@ spec: name: $package source: $source_name sourceNamespace: $source_namespace +${spec_extra} EOD return 0 } @@ -136,11 +139,11 @@ check_operator_status() { } install_serverless_logic_ocp_operator() { - install_subscription logic-operator-rhel8 openshift-operators alpha logic-operator-rhel8 redhat-operators openshift-marketplace + install_subscription logic-operator openshift-operators stable logic-operator redhat-operators openshift-marketplace return 0 } waitfor_serverless_logic_ocp_operator() { - check_operator_status 500 openshift-operators "OpenShift Serverless Logic Operator (Alpha)" Succeeded + check_operator_status 500 openshift-operators "Red Hat OpenShift Serverless Logic" Succeeded return 0 } @@ -454,11 +457,12 @@ main() { log::info "OpenShift Serverless Operator already installed" fi - if ! oc get subscription logic-operator-rhel8 -n openshift-operators &>/dev/null; then + if oc get subscription logic-operator -n openshift-operators &>/dev/null || \ + oc get subscription logic-operator-rhel8 -n openshift-operators &>/dev/null; then + log::info "OpenShift Serverless Logic Operator already installed" + else log::info "Installing OpenShift Serverless Logic Operator..." install_serverless_logic_ocp_operator - else - log::info "OpenShift Serverless Logic Operator already installed" fi log::info "Waiting for operators to be ready..."