chore(ci): fixing OCP Operator #4186

zdrapela · 2026-02-04T11:45:12Z

Description

This PR fixes the main issues with deployments, and temporarily disables Orchestrator on Operator-backed deployments. This will be fixed in a separate PR #4154. Also https://issues.redhat.com/browse/RHDHBUGS-2608 is out of scope.

Update Operator CRD
Override CATALOG_INDEX_IMAGE (hack as in fix(tests): use latest catalog index to resolve/workaround e2e issues #4065)
Fix OpenShift Serverless Logic Operator (Alpha) check
Remove unused functions in utils.sh
Align the Orchestrator versions with what's defined in values-showcase yaml.

Which issue(s) does this PR fix

Fixes https://issues.redhat.com/browse/RHDHBUGS-2606

PR acceptance criteria

Please make sure that the following steps are complete:

GitHub Actions are completed and successful
Unit Tests are updated and passing
E2E Tests are updated and passing
Documentation is updated if necessary (requirement for new features)
Add a screenshot if the change is UX/UI related

How to test changes / Special notes to the reviewer

github-actions · 2026-02-04T12:27:17Z

The image is available at:

zdrapela · 2026-02-04T12:53:34Z

/test e2e-ocp-operator
/test e2e-gke-operator

zdrapela · 2026-02-04T12:53:58Z

/test e2e-ocp-operator-nightly
/test e2e-gke-operator-nightly

github-actions · 2026-02-04T13:41:06Z

The image is available at:

zdrapela · 2026-02-04T15:22:21Z

/test e2e-ocp-operator-nightly
/test e2e-gke-operator-nightly

zdrapela · 2026-02-04T15:23:25Z

/test e2e-ocp-helm-nightly

zdrapela · 2026-02-04T15:56:12Z

/test e2e-ocp-operator-nightly
/test e2e-gke-operator-nightly

/test e2e-ocp-helm-nightly

github-actions · 2026-02-04T16:37:53Z

The image is available at:

zdrapela · 2026-02-04T20:34:49Z

/test e2e-gke-operator-nightly
/test e2e-ocp-operator-nightly

github-actions · 2026-02-04T20:35:09Z

🚫 Image Push Skipped.

The container image push was skipped because the build was skipped (either due to [skip-build] tag or no relevant changes with existing image)

zdrapela · 2026-02-05T10:32:37Z

/test e2e-ocp-operator-nightly
/test e2e-gke-operator-nightly

github-actions · 2026-02-05T11:16:03Z

The image is available at:

github-actions · 2026-02-05T12:16:34Z

🚫 Image Push Skipped.

The container image push was skipped because the build was skipped (either due to [skip-build] tag or no relevant changes with existing image)

zdrapela · 2026-02-05T12:35:10Z

/test e2e-ocp-operator-nightly
/test e2e-gke-operator-nightly

github-actions · 2026-02-05T12:36:42Z

🚫 Image Push Skipped.

The container image push was skipped because the build was skipped (either due to [skip-build] tag or no relevant changes with existing image)

those were replaced during refactoring

zdrapela · 2026-02-05T15:11:29Z

/test e2e-ocp-operator-nightly

zdrapela · 2026-02-05T15:26:41Z

/review
-i

rhdh-qodo-merge · 2026-02-05T15:27:24Z

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

🎫 Ticket compliance analysis 🔶 RHDHBUGS-2608 - Partially compliant Compliant requirements: Non-compliant requirements: Update runtime change E2E tests so they run successfully on Operator-backed deployments (not only Helm-backed). Requires further human verification: RHDHBUGS-2606 - Partially compliant Compliant requirements: Update Operator jobs/manifests to use `rhdh.redhat.com/v1alpha5` instead of the old configuration style. Apply the `CATALOG_INDEX_IMAGE` override hack to Operator-backed deployments (as previously done for Helm). Non-compliant requirements: Requires further human verification: Confirm Operator-backed CI jobs actually reconcile these updated Backstage CRs successfully and the deployed pods use the intended images and `CATALOG_INDEX_IMAGE` value.
⏱️ Estimated effort to review: 3 🔵🔵🔵⚪⚪
🔒 Security concerns TLS verification disabled: Multiple Operator Backstage CRs add `NODE_TLS_REJECT_UNAUTHORIZED` set to `"0"` (e.g., in `.ibm/pipelines/resources/rhdh-operator/rhdh-start.yaml` and `_K8s.yaml` variants). This disables Node.js TLS certificate validation and can enable MITM attacks if ever used outside a strictly isolated test environment. Consider scoping it to CI-only via conditional injection, or removing it if not strictly required.
⚡ Recommended focus areas for review Test Coverage Orchestrator deployment steps are commented out and replaced with a warning log, while Playwright specs also mark Operator runs as `fixme`. This can make CI green while silently skipping meaningful coverage on Operator-backed deployments; verify this is acceptable for the ticket scope and that follow-up work is tracked/owned. initiate_operator_deployments() { log::info "Initiating Operator-backed deployments on OCP" namespace::configure "${NAME_SPACE}" deploy_test_backstage_customization_provider "${NAME_SPACE}" local rhdh_base_url="https://backstage-${RELEASE_NAME}-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}" apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}" config::create_dynamic_plugins_config "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml" oc apply -f /tmp/configmap-dynamic-plugins.yaml -n "${NAME_SPACE}" deploy_redis_cache "${NAME_SPACE}" deploy_rhdh_operator "${NAME_SPACE}" "${DIR}/resources/rhdh-operator/rhdh-start.yaml" # TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator workflows deployment on operator # enable_orchestrator_plugins_op "${NAME_SPACE}" # deploy_orchestrator_workflows_operator "${NAME_SPACE}" log::warn "Skipping orchestrator plugins and workflows deployment on Operator $NAME_SPACE deployment" namespace::configure "${NAME_SPACE_RBAC}" config::create_conditional_policies_operator /tmp/conditional-policies.yaml config::prepare_operator_app_config "${DIR}/resources/config_map/app-config-rhdh-rbac.yaml" local rbac_rhdh_base_url="https://backstage-${RELEASE_NAME_RBAC}-${NAME_SPACE_RBAC}.${K8S_CLUSTER_ROUTER_BASE}" apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}" config::create_dynamic_plugins_config "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml" oc apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${NAME_SPACE_RBAC}" deploy_rhdh_operator "${NAME_SPACE_RBAC}" "${DIR}/resources/rhdh-operator/rhdh-start-rbac.yaml" # TODO: https://issues.redhat.com/browse/RHDHBUGS-2184 fix orchestrator workflows deployment on operator # enable_orchestrator_plugins_op "${NAME_SPACE_RBAC}" # deploy_orchestrator_workflows_operator "${NAME_SPACE_RBAC}" log::warn "Skipping orchestrator plugins and workflows deployment on Operator $NAME_SPACE_RBAC deployment" }
📚 Focus areas based on broader codebase context Image Override The PR hard-codes `CATALOG_INDEX_IMAGE` to `quay.io/rhdh/plugin-catalog-index:1.10` in the Backstage CR envs. Verify this does not conflict with the operator’s intended `RELATED_IMAGE_catalog_index` flow and that the version stays aligned across operator deployment and dynamic plugin install logic. (Ref 1, Ref 2) - name: CATALOG_INDEX_IMAGE value: "quay.io/rhdh/plugin-catalog-index:1.10" containers: - install-dynamic-plugins Reference reasoning: The operator deployment pattern sets `RELATED_IMAGE_catalog_index` (not a hard-coded `CATALOG_INDEX_IMAGE`) and the deployment testdata notes `CATALOG_INDEX_IMAGE` should be replaced by `RELATED_IMAGE_catalog_index` when present. This suggests keeping the operator-managed related image as the single source of truth (or ensuring the hard-coded override is consistent with it).
📄 References redhat-developer/rhdh-operator/config/profile/rhdh/patches/deployment-patch.yaml [1-34] redhat-developer/rhdh-operator/pkg/model/testdata/rhdh-deployment.yaml [36-58] redhat-developer/rhdh-chart/charts/backstage/values.yaml [357-364] redhat-developer/rhdh-chart/charts/orchestrator-infra/values.yaml [1-18] redhat-developer/rhdh-chart/charts/orchestrator-infra/ci/upstream-olm-values.yaml [1-13] redhat-developer/rhdh-chart/charts/orchestrator-infra/values.yaml [20-35] redhat-developer/rhdh-chart/charts/orchestrator-software-templates-infra/ci/upstream-values.yaml [1-27] redhat-developer/rhdh-chart/charts/orchestrator-software-templates-infra/values.yaml [1-18]

zdrapela · 2026-02-05T19:06:12Z

/test e2e-gke-operator-nightly

.ibm/pipelines/resources/rhdh-operator/rhdh-start.yaml

e2e-tests/playwright/e2e/plugins/orchestrator/greeting-workflow.spec.ts

.ibm/pipelines/value_files/diff-values_showcase-rbac_OSD-GCP.yaml

subhashkhileri · 2026-02-06T12:38:06Z

/lgtm

openshift-ci · 2026-02-06T12:55:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rm3l, subhashkhileri

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:

~~.ibm/OWNERS~~ [rm3l,subhashkhileri]
~~e2e-tests/OWNERS~~ [rm3l,subhashkhileri]

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

zdrapela · 2026-02-06T14:37:26Z

/test e2e-ocp-helm

zdrapela · 2026-02-06T19:48:50Z

/test e2e-ocp-helm

zdrapela · 2026-02-07T09:52:03Z

/test e2e-ocp-helm

zdrapela · 2026-02-11T12:29:28Z

/test e2e-ocp-helm

openshift-ci · 2026-02-11T14:12:18Z

@zdrapela: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-ocp-operator-nightly	`7d3f35f`	link	false	`/test e2e-ocp-operator-nightly`
ci/prow/e2e-gke-operator-nightly	`7d3f35f`	link	false	`/test e2e-gke-operator-nightly`
ci/prow/e2e-ocp-helm	`7d3f35f`	link	true	`/test e2e-ocp-helm`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci · 2026-02-11T14:37:09Z

New changes are detected. LGTM label has been removed.

zdrapela · 2026-02-11T14:37:14Z

/test e2e-ocp-operator-nightly

zdrapela · 2026-02-11T14:37:27Z

/test eks-operator-nightly

openshift-ci · 2026-02-11T14:37:31Z

@zdrapela: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-ocp-helm

The following commands are available to trigger optional jobs:

/test cleanup-mapt-destroy-orphaned-aks-clusters

/test cleanup-mapt-destroy-orphaned-eks-clusters

/test e2e-aks-helm-nightly

/test e2e-aks-operator-nightly

/test e2e-eks-helm-nightly

/test e2e-eks-operator-nightly

/test e2e-gke-helm-nightly

/test e2e-gke-operator-nightly

/test e2e-ocp-helm-nightly

/test e2e-ocp-helm-upgrade-nightly

/test e2e-ocp-operator-auth-providers-nightly

/test e2e-ocp-operator-nightly

/test e2e-ocp-v4-17-helm-nightly

/test e2e-ocp-v4-19-helm-nightly

/test e2e-ocp-v4-20-helm-nightly

/test e2e-osd-gcp-helm-nightly

/test e2e-osd-gcp-operator-nightly

Use /test all to run the following jobs that were automatically triggered:

pull-ci-redhat-developer-rhdh-main-e2e-ocp-helm

Details

In response to this:

/test eks-operator-nightly

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

sonarqubecloud · 2026-02-11T14:38:16Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

github-actions · 2026-02-11T15:18:13Z

The image is available at:

openshift-ci bot requested review from psrna and rm3l February 4, 2026 11:45

zdrapela force-pushed the fix-operator branch from 0f2382a to cc03e7f Compare February 4, 2026 12:53

zdrapela force-pushed the fix-operator branch from cc03e7f to 4655ccf Compare February 4, 2026 15:22

zdrapela force-pushed the fix-operator branch from 4655ccf to 978cf00 Compare February 4, 2026 15:55

zdrapela force-pushed the fix-operator branch from 978cf00 to 70dc934 Compare February 4, 2026 20:34

zdrapela force-pushed the fix-operator branch from 0f60e1c to b8c2a35 Compare February 5, 2026 10:32

zdrapela force-pushed the fix-operator branch from 46387e6 to 206d30b Compare February 5, 2026 12:15

teknaS47 and others added 7 commits February 5, 2026 14:03

fix(ci): add polling for operator configmap and fix yq merge syntax

d70cfa6

fix(ci): increase deployment wait timeout to 15 minutes

73f65dc

chore(ci): update Operator CRD config

87e6d5e

chore(ci): delete unused functions

db286e8

those were replaced during refactoring

chore(ci): fix serverless logic operator name

4da461f

chore(ci): better backstage restart in orchestrator

c54c5c7

Increase dynamic plugins volume claim

4228c63

rhdh-qodo-merge bot added Possible security concern Review effort 3/5 labels Feb 5, 2026

subhashkhileri reviewed Feb 6, 2026

View reviewed changes

.ibm/pipelines/resources/rhdh-operator/rhdh-start.yaml Show resolved Hide resolved

subhashkhileri reviewed Feb 6, 2026

View reviewed changes

e2e-tests/playwright/e2e/plugins/orchestrator/greeting-workflow.spec.ts Show resolved Hide resolved

subhashkhileri mentioned this pull request Feb 6, 2026

chore(ci): fix Operator E2E [release-1.9] #4194

Open

5 tasks

rm3l reviewed Feb 6, 2026

View reviewed changes

.ibm/pipelines/value_files/diff-values_showcase-rbac_OSD-GCP.yaml Show resolved Hide resolved

rm3l mentioned this pull request Feb 6, 2026

fix(ci): bring plugin version values up to match default dynamic plugins #4153

Open

5 tasks

openshift-ci bot assigned subhashkhileri Feb 6, 2026

openshift-ci bot added lgtm approved labels Feb 6, 2026

rm3l approved these changes Feb 6, 2026

View reviewed changes

Merge branch 'main' into fix-operator

aa99b4f

openshift-ci bot removed the lgtm label Feb 11, 2026

chore(ci): fixing OCP Operator #4186

Are you sure you want to change the base?

chore(ci): fixing OCP Operator #4186

Conversation

zdrapela commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Which issue(s) does this PR fix

PR acceptance criteria

How to test changes / Special notes to the reviewer

Uh oh!

github-actions bot commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 4, 2026

Uh oh!

github-actions bot commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 4, 2026

Uh oh!

github-actions bot commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 4, 2026

Uh oh!

github-actions bot commented Feb 4, 2026

Uh oh!

zdrapela commented Feb 5, 2026

Uh oh!

github-actions bot commented Feb 5, 2026

Uh oh!

github-actions bot commented Feb 5, 2026

Uh oh!

zdrapela commented Feb 5, 2026

Uh oh!

github-actions bot commented Feb 5, 2026

Uh oh!

zdrapela commented Feb 5, 2026

Uh oh!

zdrapela commented Feb 5, 2026

Uh oh!

rhdh-qodo-merge bot commented Feb 5, 2026

PR Reviewer Guide 🔍

Uh oh!

zdrapela commented Feb 5, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

subhashkhileri commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

zdrapela commented Feb 6, 2026

Uh oh!

zdrapela commented Feb 6, 2026

Uh oh!

zdrapela commented Feb 7, 2026

Uh oh!

zdrapela commented Feb 11, 2026

Uh oh!

openshift-ci bot commented Feb 11, 2026

Uh oh!

openshift-ci bot commented Feb 11, 2026

Uh oh!

zdrapela commented Feb 11, 2026

Uh oh!

zdrapela commented Feb 11, 2026

Uh oh!

openshift-ci bot commented Feb 11, 2026

Uh oh!

sonarqubecloud bot commented Feb 11, 2026

Quality Gate passed

Uh oh!

github-actions bot commented Feb 11, 2026

Uh oh!

zdrapela commented Feb 4, 2026 •

edited

Loading