Skip to content

[release-1.9] fix(orchestrator-infra): Bump OSL to 1.37.1 [RHIDP-11679]#318

Merged
rm3l merged 1 commit intoredhat-developer:release-1.9from
rm3l:rhidp-11679-bump-openshift-serverless-logic-version-to-1.37.1-in-the-install-methods--1.9
Feb 13, 2026
Merged

[release-1.9] fix(orchestrator-infra): Bump OSL to 1.37.1 [RHIDP-11679]#318
rm3l merged 1 commit intoredhat-developer:release-1.9from
rm3l:rhidp-11679-bump-openshift-serverless-logic-version-to-1.37.1-in-the-install-methods--1.9

Conversation

@rm3l
Copy link
Copy Markdown
Member

@rm3l rm3l commented Feb 13, 2026

Manual cherry-pick of #317

@rhdh-qodo-merge
Copy link
Copy Markdown

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

🎫 Ticket compliance analysis ✅

RHIDP-11679 - PR Code Verified

Compliant requirements:

  • Update the Install Methods to reference OSL version 1.37.1.

Requires further human verification:

  • Confirm the referenced install-method docs/commands are the complete set of install methods used in the release (and not duplicated elsewhere).
  • Validate in a cluster that installing with startingCSV logic-operator.v1.37.1 succeeds and that the CRDs packaged under crds/ match what the operator expects for 1.37.1.
⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
🔒 No security concerns identified
⚡ Recommended focus areas for review

Docs correctness

The new CRD extraction instructions switch to podman and write into crds/... paths; verify these paths match the chart layout and that the guidance is accurate/consistent with the repository (including whether helm.sh/hook annotations are indeed required and where they should be applied).

The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the `crds/` directory before running `helm install`.
After installing the openshift-serverless subscription, more Knative CRDs will be installed on the cluster.

The versions of the CRDs present in the chart and the ones in the subscription must match. In order to verify the correct CRD, use this following command to extract the CRD:

```bash
export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1
podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml

podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml

After running these commands, you may need to re-add the helm.sh/hook annotations.


</details>

<details><summary><a href='https://github.com/redhat-developer/rhdh-chart/pull/318/files#diff-04e92a4f0b7513b0341d3f8487f044b6954d4a640d246f2725662b4ddac4e696R10-R18'><strong>Version alignment</strong></a>

The default `startingCSV` is bumped to `logic-operator.v1.37.1`; ensure the chart’s bundled CRDs (and any other pinned OSL references) are updated to the matching 1.37.1 versions so installs don’t fail due to version/CRD mismatches.
</summary>

```yaml
# --  whether the update should be installed automatically
installPlanApproval: Manual
# -- name of the operator package
name: logic-operator
# --  name of the catalog source
source: redhat-operators
sourceNamespace: openshift-marketplace
# -- The initial version of the operator, must match CRDs installed by the chart
startingCSV: logic-operator.v1.37.1
📄 References
  1. redhat-developer/rhdh-chart/charts/orchestrator-infra/ci/upstream-olm-values.yaml [1-13]
  2. redhat-developer/rhdh-chart/charts/orchestrator-infra/templates/tests/infra-test.yaml [0-2]
  3. redhat-developer/rhdh-chart/charts/backstage/values.yaml [357-364]
  4. redhat-developer/rhdh-chart/charts/backstage/ci/with-orchestrator-values.yaml [1-21]
  5. redhat-developer/rhdh-chart/charts/orchestrator-software-templates/values.yaml [1-12]
  6. redhat-developer/rhdh-chart/charts/backstage/values.yaml [396-404]
  7. redhat-developer/rhdh-chart/cr.yaml [1-2]
  8. redhat-developer/rhdh-chart/charts/orchestrator-software-templates-infra/Chart.yaml [1-17]

@rhdh-qodo-merge rhdh-qodo-merge Bot added the enhancement New feature or request label Feb 13, 2026
@rhdh-qodo-merge
Copy link
Copy Markdown

PR Type

Enhancement


Description

  • Bump OpenShift Serverless Logic operator to version 1.37.1

  • Update chart version from 0.4.0 to 0.4.1

  • Improve CRD extraction documentation with updated commands

  • Replace docker with podman and add proper path specifications


File Walkthrough

Relevant files
Configuration changes
Chart.yaml
Update chart version to 0.4.1                                                       

charts/orchestrator-infra/Chart.yaml

  • Update chart version from 0.4.0 to 0.4.1
+1/-1     
values.schema.json
Update schema default operator version                                     

charts/orchestrator-infra/values.schema.json

  • Update startingCSV default from logic-operator.v1.37.0 to
    logic-operator.v1.37.1
+1/-1     
values.schema.tmpl.json
Update template schema operator version                                   

charts/orchestrator-infra/values.schema.tmpl.json

  • Update startingCSV default from logic-operator.v1.37.0 to
    logic-operator.v1.37.1
+1/-1     
values.yaml
Update default operator version in values                               

charts/orchestrator-infra/values.yaml

  • Update startingCSV from logic-operator.v1.37.0 to
    logic-operator.v1.37.1
+1/-1     
Documentation
README.md
Update documentation for OSL 1.37.1 and improve CRD instructions

charts/orchestrator-infra/README.md

  • Update version badge from 0.4.0 to 0.4.1
  • Update helm install command example to use version 0.4.1
  • Update OSL bundle version from 1.37.0 to 1.37.1 in CRD extraction
    commands
  • Replace docker with podman and add proper directory paths
  • Add note about re-adding helm.sh/hook annotations
  • Fix markdown formatting for crds/ directory reference
+10/-7   
README.md.gotmpl
Update template documentation for OSL 1.37.1                         

charts/orchestrator-infra/README.md.gotmpl

  • Update OSL bundle version from 1.37.0 to 1.37.1
  • Replace docker with podman container run commands
  • Add environment variable for bundle reference
  • Update output paths to include proper crds/ subdirectories
  • Add note about re-adding helm.sh/hook annotations
  • Fix markdown formatting for crds/ directory reference
+8/-5     

@rm3l rm3l added lgtm approved and removed enhancement New feature or request labels Feb 13, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Feb 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rm3l rm3l force-pushed the rhidp-11679-bump-openshift-serverless-logic-version-to-1.37.1-in-the-install-methods--1.9 branch from 2988f5f to c0b6daa Compare February 13, 2026 11:51
@openshift-ci openshift-ci Bot removed the lgtm label Feb 13, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Feb 13, 2026

New changes are detected. LGTM label has been removed.

@sonarqubecloud
Copy link
Copy Markdown

@rhdh-qodo-merge
Copy link
Copy Markdown

PR Code Suggestions ✨

Explore these optional code suggestions:

CategorySuggestion                                                                                                                                    Impact
High-level
Include updated CRD files in PR

The PR updates the OpenShift Serverless Logic version but omits the required CRD
file updates in the crds/ directory. It is suggested to fetch and commit the
correct CRDs to prevent installation failures.

Examples:

charts/orchestrator-infra/README.md [106-120]
The orchestrator-infra chart requires several CRDs for Knative Eventing and Knative Serving. These CRDs will be applied prior to installing the chart, ensuring that Knative CRs can be created as part of the chart's deployment process. This approach eliminates the need to wait for the OpenShift Serverless Operator's subscription to install them beforehand.

The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the `crds/` directory before running `helm install`.
After installing the openshift-serverless subscription, more Knative CRDs will be installed on the cluster.

The versions of the CRDs present in the chart and the ones in the subscription must match. In order to verify the correct CRD, use this following command to extract the CRD:

```bash
export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1
podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml

 ... (clipped 5 lines)

Solution Walkthrough:

Before:

# charts/orchestrator-infra/values.yaml
serverlessLogicOperator:
  subscription:
    spec:
      startingCSV: logic-operator.v1.37.1

# charts/orchestrator-infra/README.md
...
The KnativeEventing and KnativeServing CRDs are required for this chart to run. These CRDs need to be present under the `crds/` directory...

# charts/orchestrator-infra/crds/
# (Contains outdated CRD files for v1.37.0, not shown in PR diff)

After:

# charts/orchestrator-infra/values.yaml
serverlessLogicOperator:
  subscription:
    spec:
      startingCSV: logic-operator.v1.37.1

# charts/orchestrator-infra/crds/knative-eventing/knative-eventing-crd.yaml
# (New file content for v1.37.1 is added)
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
...

# charts/orchestrator-infra/crds/knative-serving/knative-serving-crd.yaml
# (New file content for v1.37.1 is added)
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
...
Suggestion importance[1-10]: 9

__

Why: This suggestion correctly identifies a critical omission; the PR updates operator versions but fails to include the corresponding CRD files, which would cause installation failures and break the chart.

High
General
Improve clarity by renaming a variable

Rename the osl_bundle variable to serverless_bundle for clarity, as it points to
the "OpenShift Serverless Operator" image, not the "OpenShift Serverless Logic"
one.

charts/orchestrator-infra/README.md [114-117]

-export osl_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1
-podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml
+export serverless_bundle=registry.redhat.io/openshift-serverless-1/serverless-operator-bundle:1.37.1
+podman container run --rm --entrypoint cat "$serverless_bundle" /manifests/operator_v1beta1_knativeeventing_crd.yaml > crds/knative-eventing/knative-eventing-crd.yaml
 
-podman container run --rm --entrypoint cat "$osl_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml
+podman container run --rm --entrypoint cat "$serverless_bundle" /manifests/operator_v1beta1_knativeserving_crd.yaml > crds/knative-serving/knative-serving-crd.yaml
  • Apply / Chat
Suggestion importance[1-10]: 4

__

Why: The suggestion correctly identifies that the variable name osl_bundle is misleading and could cause confusion, improving the clarity of the documentation for a newly added script.

Low
  • More

@rm3l rm3l added the lgtm label Feb 13, 2026
@rm3l rm3l merged commit f24fed4 into redhat-developer:release-1.9 Feb 13, 2026
5 of 6 checks passed
@rm3l rm3l deleted the rhidp-11679-bump-openshift-serverless-logic-version-to-1.37.1-in-the-install-methods--1.9 branch February 13, 2026 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant