Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
16 changes: 10 additions & 6 deletions src/deployment/orchestrator/install-orchestrator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -118,6 +120,7 @@ spec:
name: $package
source: $source_name
sourceNamespace: $source_namespace
${spec_extra}
EOD
return 0
}
Expand All @@ -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
}

Expand Down Expand Up @@ -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..."
Expand Down
Loading