Skip to content

Commit a5fdf81

Browse files
authored
fix: switch OSL to stable/logic-operator (#75)
* fix: pin OSL to stable/logic-operator v1.37.2 Made-with: Cursor * fix: switch OSL to stable/logic-operator (GA package) Made-with: Cursor
1 parent cdcc7d0 commit a5fdf81

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

docs/changelog.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
## [1.1.25] - Current
5+
## [1.1.26] - Current
6+
7+
### Fixed
8+
9+
- **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.
10+
11+
## [1.1.25]
612

713
### Added
814

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@red-hat-developer-hub/e2e-test-utils",
3-
"version": "1.1.25",
3+
"version": "1.1.26",
44
"description": "Test utilities for RHDH E2E tests",
55
"license": "Apache-2.0",
66
"repository": {

src/deployment/orchestrator/install-orchestrator.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ log::success() {
105105
# Operator subscription and status
106106
# ---------------------------------------------------------------------------
107107
install_subscription() {
108-
local name=$1 namespace=$2 channel=$3 package=$4 source_name=$5 source_namespace=$6
108+
local name=$1 namespace=$2 channel=$3 package=$4 source_name=$5 source_namespace=$6 starting_csv=${7:-}
109+
local spec_extra=""
110+
[[ -n "$starting_csv" ]] && spec_extra=" startingCSV: $starting_csv"
109111
oc apply -f - << EOD
110112
apiVersion: operators.coreos.com/v1alpha1
111113
kind: Subscription
@@ -118,6 +120,7 @@ spec:
118120
name: $package
119121
source: $source_name
120122
sourceNamespace: $source_namespace
123+
${spec_extra}
121124
EOD
122125
return 0
123126
}
@@ -136,11 +139,11 @@ check_operator_status() {
136139
}
137140

138141
install_serverless_logic_ocp_operator() {
139-
install_subscription logic-operator-rhel8 openshift-operators alpha logic-operator-rhel8 redhat-operators openshift-marketplace
142+
install_subscription logic-operator openshift-operators stable logic-operator redhat-operators openshift-marketplace
140143
return 0
141144
}
142145
waitfor_serverless_logic_ocp_operator() {
143-
check_operator_status 500 openshift-operators "OpenShift Serverless Logic Operator (Alpha)" Succeeded
146+
check_operator_status 500 openshift-operators "Red Hat OpenShift Serverless Logic" Succeeded
144147
return 0
145148
}
146149

@@ -454,11 +457,12 @@ main() {
454457
log::info "OpenShift Serverless Operator already installed"
455458
fi
456459

457-
if ! oc get subscription logic-operator-rhel8 -n openshift-operators &>/dev/null; then
460+
if oc get subscription logic-operator -n openshift-operators &>/dev/null || \
461+
oc get subscription logic-operator-rhel8 -n openshift-operators &>/dev/null; then
462+
log::info "OpenShift Serverless Logic Operator already installed"
463+
else
458464
log::info "Installing OpenShift Serverless Logic Operator..."
459465
install_serverless_logic_ocp_operator
460-
else
461-
log::info "OpenShift Serverless Logic Operator already installed"
462466
fi
463467

464468
log::info "Waiting for operators to be ready..."

0 commit comments

Comments
 (0)