Skip to content

Update Boilerplate to Fix CI Issues#643

Merged
openshift-merge-bot[bot] merged 4 commits into
openshift:masterfrom
devppratik:update-boilerplate-jun-2026
Jun 5, 2026
Merged

Update Boilerplate to Fix CI Issues#643
openshift-merge-bot[bot] merged 4 commits into
openshift:masterfrom
devppratik:update-boilerplate-jun-2026

Conversation

@devppratik

@devppratik devppratik commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Updates boilerplate to the latest version
  • Updates UBI minimal image to 9.8-1780378819
  • Updates boilerplate image to v8.3.6
  • Updates dependabot configuration
  • Updates ensure.sh and standard.mk

Changes

  • Updated boilerplate commit reference
  • Refreshed generated files from latest boilerplate templates

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Chores
    • Reformatted YAML schema descriptions for consistency and readability without changing any public API behavior.
    • Updated Go toolchain and dependency versions to align builds and improve reliability.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 4, 2026

Copy link
Copy Markdown

Walkthrough

The CustomResourceDefinition for upgradeconfigs.upgrade.managed.openshift.io is regenerated with YAML formatting improvements. Multi-line field descriptions use block-scalar style; schema properties, validation rules, and API contract remain unchanged. The repository's go.mod is also updated with a new toolchain and bumped dependency versions.

Changes

CRD Reformatting

Layer / File(s) Summary
CRD schema formatting update
deploy_pko/CustomResourceDefinition-upgradeconfigs.upgrade.managed.openshift.io.yaml
CustomResourceDefinition YAML is rewritten: multi-line descriptions for schema fields now use block-scalar syntax and a leading blank line was added; schema structure, validation, enums, and printer columns are unchanged.

Go module and dependencies

Layer / File(s) Summary
Toolchain and direct dependency bumps
go.mod
go directive and toolchain changed to Go 1.24.x; direct requires for OpenShift OCM libraries and prometheus/client_golang were bumped.
Indirect dependency updates (group A)
go.mod
Updated multiple indirect dependencies including go-restful, fatih/color, fxamacker/cbor, and adjacent indirect entries.
Indirect dependency updates (group B)
go.mod
Updated additional indirect deps in the tail of the require block: mattn/*, moby/spdystream, openshift-online models, prometheus/common, various golang.org/x/*, and google.golang.org/protobuf pins.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 13 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning 6 test files create mockCtrl but lack AfterEach cleanup; assertions throughout tests lack meaningful failure messages per requirements. Add AfterEach cleanup to 6 test files (podDeleteStrategy, removeFinalizersStrategy, stuckTerminatingStrategy, localprovider, pod, healthcheck_pdb tests). Add failure messages to Expect() calls.
Microshift Test Compatibility ⚠️ Warning The PR adds new Ginkgo e2e tests in test/e2e/managed_upgrade_operator_tests.go that use ClusterVersion API (config.openshift.io) without MicroShift skip labels, apigroup tags, or runtime checks. Add [apigroup:config.openshift.io] tags to test names or add runtime exutil.IsMicroShiftCluster() checks to skip tests on MicroShift, or wrap tests in Describe/Context with such protection.
✅ Passed checks (13 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'Update Boilerplate to Fix CI Issues' accurately describes the main change in the PR, which involves updating boilerplate files and reverting dependency changes to resolve CI failures related to golangci-lint compatibility.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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.
Stable And Deterministic Test Names ✅ Passed All Ginkgo test names are stable and deterministic. No dynamic patterns found in test titles across 69 test files added in this PR.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR is a boilerplate/dependency update with no new Ginkgo e2e tests added. The check only applies when new tests are created, not during boilerplate initialization.
Topology-Aware Scheduling Compatibility ✅ Passed PR does not introduce/modify deployment manifests with scheduling constraints; changes are boilerplate, CRD formatting, and dependency updates only.
Ote Binary Stdout Contract ✅ Passed PR only updates boilerplate and dependencies. No new process-level stdout writes were introduced in main(), init(), BeforeSuite(), or other OTE-relevant code sections.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR does not add any new Ginkgo e2e tests. It only modifies a CRD YAML file and go.mod for dependency/toolchain updates. The IPv6 compatibility check does not apply.
No-Weak-Crypto ✅ Passed No weak cryptography detected. Comprehensive scan found no MD5, SHA1, DES, RC4, 3DES, Blowfish, or ECB mode usage. No custom crypto implementations or non-constant-time secret comparisons identified.
Container-Privileges ✅ Passed No privileged container configurations found; all manifests use restricted-v2 SCC and proper security contexts without escalation or host access.
No-Sensitive-Data-In-Logs ✅ Passed PR makes no changes to logging code; only updates boilerplate, go.mod versions, and CRD YAML formatting. No new logging statements exposed.

✏️ 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.

@devppratik devppratik changed the title Update boilerplate (June 2026) Update Boilerplate to Fix CI Issues Jun 4, 2026
@codecov-commenter

codecov-commenter commented Jun 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 54.27%. Comparing base (35338f3) to head (b6daec5).

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #643   +/-   ##
=======================================
  Coverage   54.27%   54.27%           
=======================================
  Files         123      123           
  Lines        6204     6204           
=======================================
  Hits         3367     3367           
  Misses       2631     2631           
  Partials      206      206           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

devppratik and others added 3 commits June 4, 2026 17:39
Reverts go.mod/go.sum to state before PR openshift#620 to fix CI.

The boilerplate update brought toolchain go1.26.3, but golangci-lint
v2.7.2 was built with Go 1.25 and cannot lint newer Go versions.

Restores: go 1.24.0, toolchain go1.24.9
Keeps: June 2026 boilerplate updates

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

@devppratik: all tests passed!

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.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (1)
go.mod (1)

3-5: 💤 Low value

Documentation example is now outdated.

The downgrade to Go 1.24.0 and toolchain go1.24.9 is well-justified by the PR description (fixing golangci-lint compatibility). However, docs/development.md:26-33 shows go version go1.23.9 as an example. While the ">=1.23" requirement is still met, the example should be updated to reflect the current version to avoid confusion.

As per coding guidelines, Context snippet 1 shows the development docs with an outdated Go version example.

🤖 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 `@go.mod` around lines 3 - 5, Update the example Go version in the development
docs so it matches the project go.mod/toolchain (replace the example "go version
go1.23.9" in docs/development.md with the current version used in
go.mod/toolchain, e.g., "go version go1.24.9" or otherwise reflect go1.24.x);
locate the example text in docs/development.md (the "go version" example block)
and change it to the updated version string to avoid confusion.
🤖 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.

Inline comments:
In `@go.mod`:
- Line 87: The go.mod currently references the vulnerable indirect module
github.com/moby/spdystream v0.5.0; update that dependency to v0.5.1 or later in
go.mod (or via your module update tooling) to pick up the fix for the SPDY/3
parser DoS, then run dependency resolution (e.g., update modules and tidy) and
re-run tests/build to ensure nothing breaks; look for the module name
"github.com/moby/spdystream" and the go.mod entry to make the change.

---

Nitpick comments:
In `@go.mod`:
- Around line 3-5: Update the example Go version in the development docs so it
matches the project go.mod/toolchain (replace the example "go version go1.23.9"
in docs/development.md with the current version used in go.mod/toolchain, e.g.,
"go version go1.24.9" or otherwise reflect go1.24.x); locate the example text in
docs/development.md (the "go version" example block) and change it to the
updated version string to avoid confusion.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 031e69c0-2227-4784-9013-d80d62b1e837

📥 Commits

Reviewing files that changed from the base of the PR and between 7307ca7 and b6daec5.

⛔ Files ignored due to path filters (14)
  • deploy_pko/.test-fixtures/config-with-proxy/Cleanup-OLM-Job.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/ClusterRole-managed-upgrade-operator.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/ClusterRoleBinding-managed-upgrade-operator.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/ConfigMap-trusted-ca-bundle.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/CustomResourceDefinition-upgradeconfigs.upgrade.managed.openshift.io.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/Deployment-managed-upgrade-operator.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/Role-managed-upgrade-operator-other.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/Role-managed-upgrade-operator.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/Role-prometheus-k8s.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/RoleBinding-managed-upgrade-operator-other.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/RoleBinding-managed-upgrade-operator.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/RoleBinding-prometheus-k8s.yaml is excluded by !**/.test-fixtures/**
  • deploy_pko/.test-fixtures/config-with-proxy/ServiceAccount-managed-upgrade-operator.yaml is excluded by !**/.test-fixtures/**
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (1)
  • go.mod

Comment thread go.mod
@ravitri

ravitri commented Jun 5, 2026

Copy link
Copy Markdown
Member

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2026
@openshift-ci

openshift-ci Bot commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: devppratik, ravitri

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 81fc2f8 into openshift:master Jun 5, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants