chore: move upstream rhdh-operator to...

[nickboldt]

What does this PR do?

chore: move upstream rhdh-operator to version 2.0 so it aligns with downstream version

Signed-off-by: rhdh-bot rhdh-bot@redhat.com

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

N/A (or see commit message above for issue number)

How to test this PR?

N/A

PR Checklist

As the author of this Pull Request I made sure that:

• Code produced is complete
• Code builds without errors
• Tests are covering the bugfix
• Relevant user documentation updated
• Relevant contributing documentation updated

Reviewers

Reviewers, please comment how you tested the PR when approving it.

[rhdh-qodo-merge]

PR Summary by Qodo

Bump rhdh-community operator manifests to v2.0.0

⚙️ Configuration changes 📝 Documentation 🕐 10-20 Minutes

AI Description

• Update default operator VERSION to 2.0.0 for upstream/downstream alignment.
• Bump operator image tags and CSV metadata to 2.0.0 across bundle and install manifests.
• Refresh docs to reference behavior starting from v2.0.0.

Diagram

graph TD
A["Release version 2.0.0"] --> B["Makefile VERSION"] --> C["CSV manifest"] --> D["Kustomize profile"] --> E["Dist install.yaml"]
B --> F["Docs note"]

Loading

High-Level Assessment

The following are alternative approaches to this PR:

1. Single source-of-truth version file

• ➕ Reduces risk of missed/partial bumps across Makefile, CSV, kustomize, and dist artifacts
• ➕ Makes automated checks straightforward (assert all manifests match VERSION)
• ➖ Requires wiring multiple generators/templates to read the same value
• ➖ May need slight tooling changes if files are currently edited directly

2. Regenerate bundle/dist in CI from VERSION

• ➕ Prevents drift between source overlays and generated dist YAML
• ➕ Makes version bumps largely a one-line change plus generated output
• ➖ Adds CI complexity and requires deterministic generation
• ➖ May change contributor workflow (generated files updated by pipeline)

Recommendation: The PR’s direct string bump is appropriate for a simple alignment change. To reduce future drift, consider introducing a single version source (or CI regeneration) so bundle/dist/docs consistently update from one authoritative value.

Files changed (5) +7 / -7

Documentation (1) +1 / -1

dynamic-plugins.mdUpdate version reference in dynamic plugins docs to v2.0.0 +1/-1

Update version reference in dynamic plugins docs to v2.0.0

• Adjusts the 'Since v…' note to reference v2.0.0 instead of v0.11.0 for the described matching behavior.

docs/dynamic-plugins.md

Other (4) +6 / -6

MakefileBump default VERSION to 2.0.0 +1/-1

Bump default VERSION to 2.0.0

• Updates the default VERSION used by the Makefile from 0.11.0 to 2.0.0, aligning build/release defaults with the intended operator release.

Makefile

backstage-operator.clusterserviceversion.yamlUpdate CSV name, image, and version to 2.0.0 +3/-3

Update CSV name, image, and version to 2.0.0

• Bumps the ClusterServiceVersion name and spec version to v2.0.0, and updates the manager image reference to quay.io/rhdh-community/operator:2.0.0.

bundle/backstage.io/manifests/backstage-operator.clusterserviceversion.yaml

kustomization.yamlPin kustomize controller image tag to 2.0.0 +1/-1

Pin kustomize controller image tag to 2.0.0

• Updates the kustomize image override tag for the operator controller to 2.0.0.

config/profile/backstage.io/kustomization.yaml

install.yamlBump distributed install manifest image tag to 2.0.0 +1/-1

Bump distributed install manifest image tag to 2.0.0

• Updates the operator deployment image in the generated dist install.yaml to quay.io/rhdh-community/operator:2.0.0.

dist/backstage.io/install.yaml

[rhdh-qodo-merge]

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 🔗 Cross-repo conflicts (0) 📜 Skill insights (0)

Context used

✅ Compliance rules (platform): 18 rules

✅ Cross-repo context

  Explored: repo: redhat-developer/rhdh (sha: 6cdd57de)

  Explored: repo: redhat-developer/rhdh-plugins (sha: fc52e7da)

1. RHDH version auto-bumped ✓ Resolved 🐞 Bug ≡ Correctness

Description

With the new default VERSION ?= 2.0.0, the Makefile’s PROFILE=rhdh default-version logic
increments the major version and rewrites VERSION to 3.0.0, so default build/bundle/image
targets will be tagged/generated with the wrong version. This creates a mismatch with the committed
2.0.0 manifests and can break release/publish/upgrade expectations for the default PROFILE ?= rhdh
flow.

Code

Makefile[R21-23]

ifeq ($(origin VERSION), undefined)
-VERSION ?= 0.11.0
+VERSION ?= 2.0.0
DEFAULT_VERSION := true

Relevance

●●● Strong

Team fixes version/manifest mismatches; similar alignment issues accepted (orchestrator versions
#1484; Subscription mismatch #2036).

PR-#1484
PR-#2036
PR-#2846

ⓘ Recommendations generated based on similar findings in past PRs

Evidence

The default profile is rhdh, the PR sets default VERSION to 2.0.0, and the existing rhdh
branch unconditionally increments the major version when DEFAULT_VERSION is true; downstream build
variables (BUNDLE_GEN_FLAGS, IMG) directly consume the rewritten VERSION/IMAGE_TAG_VERSION,
so default builds will produce 3.0.0 artifacts.

Makefile[7-41]
Makefile[79-103]

Agent prompt

The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

### Issue description
The Makefile increments the major version for `PROFILE=rhdh` when `DEFAULT_VERSION=true`. After this PR, the default `VERSION` is `2.0.0`, so the logic rewrites it to `3.0.0`, causing generated bundle/image/catalog artifacts to carry an unintended version.

### Issue Context
- `PROFILE` defaults to `rhdh`, and `VERSION` defaults to `2.0.0` when not provided.
- For `PROFILE=rhdh` and `DEFAULT_VERSION=true`, the Makefile always increments the major version (`expr $(MAJOR) + 1`) and assigns it back to `VERSION`.
- Multiple build targets use `$(VERSION)` / `$(IMAGE_TAG_VERSION)` (e.g., `BUNDLE_GEN_FLAGS` and `IMG`) so the rewrite affects actual outputs.

### Fix Focus Areas
- Makefile[9-41]
- Makefile[82-103]

### Suggested fix
Change the `PROFILE=rhdh` rewrite to only apply to the historical `0.y.z -> 1.y.z` case (e.g., only increment when `MAJOR == 0`), or remove/replace the auto-increment logic now that upstream is `2.x`. For example:
- Compute `MAJOR`, and only run the `INCREMENTED_MAJOR`/`VERSION := ...` assignment when `$(MAJOR)` equals `0`.
- Otherwise keep `VERSION` and `IMAGE_TAG_VERSION` unchanged.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

---

_{To customize comments, go to the Qodo configuration screen, or learn more in the docs.}

[sonarqubecloud]

Quality Gate passed

Issues
0 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

[rhdh-bot]

/lgtm
/approve