Skip to content

chore: unpin github.com/openshift/api#1090

Merged
openshift-merge-bot[bot] merged 1 commit into
rhobs:mainfrom
simonpasquier:unpin-openshift-api
May 13, 2026
Merged

chore: unpin github.com/openshift/api#1090
openshift-merge-bot[bot] merged 1 commit into
rhobs:mainfrom
simonpasquier:unpin-openshift-api

Conversation

@simonpasquier
Copy link
Copy Markdown
Contributor

This commit unpins the version of github.com/openshift/api to depend on the latest version. To continue supporting older OpenShift versions which require the Console v1alpha1 API (removed since 2024), we fork the github.com/openshift/api under github.com/rhobs/openshift-api and pinned to the same version that was used before this change.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 12, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: simonpasquier

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

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 12, 2026

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 90207966-71ac-44f9-b56e-45557170eb19

📥 Commits

Reviewing files that changed from the base of the PR and between a17f510 and 4ac2905.

⛔ Files ignored due to path filters (1)
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (11)
  • DEPENDENCY_CONSTRAINTS.md
  • go.mod
  • pkg/controllers/uiplugin/components.go
  • pkg/controllers/uiplugin/controller.go
  • pkg/controllers/uiplugin/dashboards.go
  • pkg/controllers/uiplugin/distributed_tracing.go
  • pkg/controllers/uiplugin/logging.go
  • pkg/controllers/uiplugin/monitoring.go
  • pkg/controllers/uiplugin/plugin_info_builder.go
  • pkg/controllers/uiplugin/troubleshooting_panel.go
  • pkg/operator/scheme.go
✅ Files skipped from review due to trivial changes (4)
  • pkg/controllers/uiplugin/plugin_info_builder.go
  • pkg/operator/scheme.go
  • pkg/controllers/uiplugin/monitoring.go
  • pkg/controllers/uiplugin/controller.go
🚧 Files skipped from review as they are similar to previous changes (4)
  • pkg/controllers/uiplugin/troubleshooting_panel.go
  • pkg/controllers/uiplugin/distributed_tracing.go
  • pkg/controllers/uiplugin/logging.go
  • go.mod

📝 Walkthrough

Walkthrough

This PR consolidates dependency pins in go.mod (adding/updating OpenShift, RHObs, and Perses entries and a local replace for pkg/apis), updates DEPENDENCY_CONSTRAINTS.md to document use of a forked OpenShift API for console v1alpha1 and to defer updates to Dependabot, and updates import paths and import ordering in all uiplugin controller files and pkg/operator/scheme.go to consume github.com/rhobs/openshift-api/console/v1alpha1.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly describes the main change: unpinning github.com/openshift/api dependency, which is the core action taken in this pull request.
Description check ✅ Passed The description is directly related to the changeset, explaining both the unpinning of github.com/openshift/api and the introduction of the fork github.com/rhobs/openshift-api for backward compatibility.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions
The command is terminated due to an error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions


Comment @coderabbitai help to get the list of available commands and usage tips.

@simonpasquier
Copy link
Copy Markdown
Contributor Author

/cc @jan--f

@openshift-ci openshift-ci Bot requested a review from jan--f May 12, 2026 14:56
@simonpasquier simonpasquier force-pushed the unpin-openshift-api branch from b05f81c to a17f510 Compare May 12, 2026 14:57
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick comments (1)
DEPENDENCY_CONSTRAINTS.md (1)

28-28: ⚡ Quick win

Clarify fork maintenance ownership beyond Dependabot

This line is too broad for the forked OpenShift API case. Dependabot can update versions, but it does not replace an explicit policy for syncing security/backport fixes from upstream into github.com/rhobs/openshift-api. Please document who owns fork syncs and the cadence/trigger (e.g., monthly or on security advisories).

Proposed doc tweak
-Dependabot takes care of dependency updates, the configuration is located at `.github/dependabot.yml`.
+Dependabot takes care of routine dependency update PRs (see `.github/dependabot.yml`).
+For `github.com/rhobs/openshift-api`, maintainers must also periodically sync relevant upstream fixes
+from `github.com/openshift/api` (especially security-related changes) while preserving `console/v1alpha1`.

As per coding guidelines, "Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity."

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@DEPENDENCY_CONSTRAINTS.md` at line 28, Replace the vague Dependabot line with
a short explicit fork-sync policy: state that Dependabot handles dependency
version updates but does not replace manual fork maintenance for
github.com/rhobs/openshift-api, name the owning team or role (e.g., "OpenShift
API Maintainers" or "Security/Platform team") as responsible for upstream syncs,
and specify the cadence/triggers (e.g., "monthly" and "on security
advisories/CVE/backports") plus required actions (e.g., create PR, test, and
merge); update DEPENDENCY_CONSTRAINTS.md to include these responsibilities,
cadence, and a contact/issue-template reference so readers know who to ping and
when.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@DEPENDENCY_CONSTRAINTS.md`:
- Line 28: Replace the vague Dependabot line with a short explicit fork-sync
policy: state that Dependabot handles dependency version updates but does not
replace manual fork maintenance for github.com/rhobs/openshift-api, name the
owning team or role (e.g., "OpenShift API Maintainers" or "Security/Platform
team") as responsible for upstream syncs, and specify the cadence/triggers
(e.g., "monthly" and "on security advisories/CVE/backports") plus required
actions (e.g., create PR, test, and merge); update DEPENDENCY_CONSTRAINTS.md to
include these responsibilities, cadence, and a contact/issue-template reference
so readers know who to ping and when.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 39904d34-b223-4c7f-86f5-260a3420d366

📥 Commits

Reviewing files that changed from the base of the PR and between b05f81c and a17f510.

⛔ Files ignored due to path filters (1)
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (11)
  • DEPENDENCY_CONSTRAINTS.md
  • go.mod
  • pkg/controllers/uiplugin/components.go
  • pkg/controllers/uiplugin/controller.go
  • pkg/controllers/uiplugin/dashboards.go
  • pkg/controllers/uiplugin/distributed_tracing.go
  • pkg/controllers/uiplugin/logging.go
  • pkg/controllers/uiplugin/monitoring.go
  • pkg/controllers/uiplugin/plugin_info_builder.go
  • pkg/controllers/uiplugin/troubleshooting_panel.go
  • pkg/operator/scheme.go
✅ Files skipped from review due to trivial changes (6)
  • pkg/controllers/uiplugin/distributed_tracing.go
  • pkg/controllers/uiplugin/dashboards.go
  • pkg/controllers/uiplugin/controller.go
  • pkg/controllers/uiplugin/plugin_info_builder.go
  • pkg/controllers/uiplugin/monitoring.go
  • pkg/operator/scheme.go
🚧 Files skipped from review as they are similar to previous changes (4)
  • pkg/controllers/uiplugin/troubleshooting_panel.go
  • pkg/controllers/uiplugin/logging.go
  • pkg/controllers/uiplugin/components.go
  • go.mod

@jan--f
Copy link
Copy Markdown
Collaborator

jan--f commented May 12, 2026

lgtm but I'll let @jgbernalp or @PeterYurkovich have final eyes on this.

@jan--f
Copy link
Copy Markdown
Collaborator

jan--f commented May 12, 2026

/retest

@simonpasquier
Copy link
Copy Markdown
Contributor Author

/cc @jgbernalp

@openshift-ci openshift-ci Bot requested a review from jgbernalp May 12, 2026 16:08
This commit unpins the version of `github.com/openshift/api` to depend
on the latest version. To continue supporting older OpenShift versions
which require the Console v1alpha1 API (removed since 2024), we fork the
`github.com/openshift/api` under `github.com/rhobs/openshift-api` and
pinned to the same version that was used before this change.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier simonpasquier force-pushed the unpin-openshift-api branch from a17f510 to 4ac2905 Compare May 13, 2026 08:33
@simonpasquier
Copy link
Copy Markdown
Contributor Author

the CI is green now (with the updated ConsolePlugin API, we need to pass an empty ContentSecurityPolicy slice otherwise the Kubernetes API rejects the request).

@jgbernalp
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label May 13, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit fad3bee into rhobs:main May 13, 2026
12 checks passed
@simonpasquier simonpasquier deleted the unpin-openshift-api branch May 13, 2026 14:58
jan--f added a commit that referenced this pull request May 19, 2026
* fix: update tls log to omit length of ciphers array (#1074)

* fix: update tls log to omit length of ciphers array

Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com>

* fix: tls cipher logging

Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com>

---------

Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com>

* build(deps): bump github.com/operator-framework/api (#1059)

Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.38.0 to 0.42.0.
- [Release notes](https://github.com/operator-framework/api/releases)
- [Changelog](https://github.com/operator-framework/api/blob/master/RELEASE.md)
- [Commits](operator-framework/api@v0.38.0...v0.42.0)

---
updated-dependencies:
- dependency-name: github.com/operator-framework/api
  dependency-version: 0.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: update obo-prom-op to v0.90.1 (#1077)

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>

* build(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring (#1060)

Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.89.0 to 0.90.1.
- [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases)
- [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md)
- [Commits](prometheus-operator/prometheus-operator@v0.89.0...v0.90.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
  dependency-version: 0.90.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: update perses operand image (#1085)

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>

* feat: coo 1.5 image tag and compat. matrix update (#1075)

* fix: add 'create tokenreview' to korrel8r RBAC (#1073)

Korrel8r uses 'create tokenreview' to get user names for session tokens.
Need usernames for reliable session keys.
Same user can get different tokens per log-in.

* fix: remove ui plugin finalizers in favor of k8s garbage collection (#1084)

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>

* NO-JIRA: remove SupportsTLSProfile (#1089)

* fix: enable tls support for troubleshooting plugin

* feat: remove supports tls profile  flag because all uiplugin support tls now

* fix: lint

* chore: unpin github.com/openshift/api (#1090)

This commit unpins the version of `github.com/openshift/api` to depend
on the latest version. To continue supporting older OpenShift versions
which require the Console v1alpha1 API (removed since 2024), we fork the
`github.com/openshift/api` under `github.com/rhobs/openshift-api` and
pinned to the same version that was used before this change.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* fix: use pointer-to-struct for fields with json omitempty (#1063)

Use pointers for API struct fields marked "omitempty".

"omitempty" does not work on non-pointer struct fields.
A zero valued struct will serialize at least as "{}" and may contain zero valued fields
if any fields are not "omitempty".
This can cause problems with default values and round-trip (de)serialization
and break even if the kubebuilder "+optional" comment is applied.

Additional fixes:
- Add nil-safe GetFoo() methods to avoid long !=nil tests.
- Rename TracingObjectStorageSpec.GCSSTSSpec to GCSWIF to match its type and json tag
- Update CEL validation rule to handle nil storage/objectStorage with has() guards
- Add nil guards for Tracing, Storage, ObjectStorageSpec, and Operators in controller code
- Remove spurious omitempty from required S3Spec.AccessKeySecret field
- Fix ConfigMapKeySelector doc comments that incorrectly referenced "Secret"

* fix: escape reserved words from perses cel validation expressions (#1091)

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>

---------

Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Jenny Zhu <jenny.a.zhu@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jan Fajerski <jan--f@users.noreply.github.com>
Co-authored-by: Alan Conway <aconway@redhat.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
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.

3 participants