Skip to content

Comments

NO-JIRA: UPSTREAM: <carry>: Add manifests verify target#586

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
RadekManak:capi-verify-target
Jan 16, 2026
Merged

NO-JIRA: UPSTREAM: <carry>: Add manifests verify target#586
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
RadekManak:capi-verify-target

Conversation

@RadekManak
Copy link

Summary

Add a verify target to ensure OCP manifests are generated correctly and no uncommitted changes exist after regeneration.

Changes

  • Add openshift/provider-version.mk to define the provider version used for manifest generation
  • Add openshift/verify-diff.sh script to verify no untracked files or uncommitted changes exist
  • Add verify and verify-% Makefile targets to enable verification workflows
  • Remove check-env dependency from ocp-manifests target (version now sourced from provider-version.mk)

Purpose

This enables CI to verify that generated OCP manifests are up-to-date by running make verify-ocp-manifests, which will:

  1. Regenerate manifests via make ocp-manifests
  2. Check for any uncommitted changes or untracked files
  3. Fail if manifests are out of sync with the code

This prevents manifests from becoming stale when the provider version or manifest generation logic changes.

Testing

The verify job will be automatically triggered by CI once the corresponding PR in openshift/release (openshift/release#71392) is merged.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 15, 2026
@openshift-ci-robot
Copy link

@RadekManak: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

Add a verify target to ensure OCP manifests are generated correctly and no uncommitted changes exist after regeneration.

Changes

  • Add openshift/provider-version.mk to define the provider version used for manifest generation
  • Add openshift/verify-diff.sh script to verify no untracked files or uncommitted changes exist
  • Add verify and verify-% Makefile targets to enable verification workflows
  • Remove check-env dependency from ocp-manifests target (version now sourced from provider-version.mk)

Purpose

This enables CI to verify that generated OCP manifests are up-to-date by running make verify-ocp-manifests, which will:

  1. Regenerate manifests via make ocp-manifests
  2. Check for any uncommitted changes or untracked files
  3. Fail if manifests are out of sync with the code

This prevents manifests from becoming stale when the provider version or manifest generation logic changes.

Testing

The verify job will be automatically triggered by CI once the corresponding PR in openshift/release (openshift/release#71392) is merged.

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link

coderabbitai bot commented Jan 15, 2026

Walkthrough

The pull request adds a provider version configuration file and restructures OpenShift Makefile targets to introduce a verification workflow. A new shell script enforces a clean working tree by checking for untracked files and unstaged changes. The ocp-manifests target dependency is simplified by removing the check-env requirement.

Changes

Cohort / File(s) Summary
Makefile configuration
openshift/Makefile
Introduced include provider-version.mk at the top. Added public phony targets verify and verify-% with verification logic. Modified ocp-manifests to depend only on $(RELEASE_DIR) instead of $(RELEASE_DIR) check-env. The verify-% target pattern executes the requested target and runs verify-diff.sh for idempotent validation.
Version configuration
openshift/provider-version.mk
New file declaring Makefile variable PROVIDER_VERSION with default value v2.10.0.
Verification script
openshift/verify-diff.sh
New shell script that enforces a clean working tree by detecting untracked files via git ls-files and checking for unstaged changes with git diff --exit-code.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

✨ Finishing touches
  • 📝 Generate docstrings

🧹 Recent nitpick comments
openshift/verify-diff.sh (1)

1-11: Consider adding set -euo pipefail for robustness.

The script logic is correct. Adding strict mode would improve reliability by catching unexpected failures early.

♻️ Suggested improvement
 #!/bin/bash
+set -euo pipefail
 
 FILE_DIFF=$(git ls-files -o --exclude-standard)

📜 Recent review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between 1b4220a and e83917e.

📒 Files selected for processing (3)
  • openshift/Makefile
  • openshift/provider-version.mk
  • openshift/verify-diff.sh
🧰 Additional context used
📓 Path-based instructions (1)
**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

  • openshift/verify-diff.sh
  • openshift/provider-version.mk
  • openshift/Makefile
🪛 checkmake (0.2.2)
openshift/Makefile

[warning] 23-23: Missing required phony target "all"

(minphony)


[warning] 23-23: Missing required phony target "clean"

(minphony)


[warning] 23-23: Missing required phony target "test"

(minphony)

🔇 Additional comments (2)
openshift/provider-version.mk (1)

1-2: LGTM!

Clean, minimal configuration file. The conditional assignment (?=) appropriately allows overriding the version when needed while providing a sensible default.

openshift/Makefile (1)

4-17: LGTM!

The verification workflow is well-structured:

  • verify-% pattern elegantly allows verifying any target by running it and checking for diffs.
  • Including provider-version.mk cleanly separates version configuration from build logic.
  • Removing check-env dependency from ocp-manifests simplifies the target appropriately since the version is now sourced from the included file.

✏️ Tip: You can disable this entire section by setting review_details to false in your review settings.


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

@RadekManak
Copy link
Author

/retest

@mdbooth
Copy link

mdbooth commented Jan 15, 2026

/lgtm
/approve

Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 2026
@openshift-ci
Copy link

openshift-ci bot commented Jan 15, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, mdbooth

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 Jan 15, 2026
@openshift-ci
Copy link

openshift-ci bot commented Jan 15, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, mdbooth

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

@damdo
Copy link
Member

damdo commented Jan 15, 2026

/retest

@damdo
Copy link
Member

damdo commented Jan 16, 2026

/verified by @damdo

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 16, 2026
@openshift-ci-robot
Copy link

@damdo: This PR has been marked as verified by @damdo.

Details

In response to this:

/verified by @damdo

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 openshift-eng/jira-lifecycle-plugin repository.

@damdo
Copy link
Member

damdo commented Jan 16, 2026

/override ci/prow/e2e-aws-serial-1of2

Unrelated issue as this change is only a tooling change that doesn't affect the payload.

@openshift-ci
Copy link

openshift-ci bot commented Jan 16, 2026

@damdo: Overrode contexts on behalf of damdo: ci/prow/e2e-aws-serial-1of2

Details

In response to this:

/override ci/prow/e2e-aws-serial-1of2

Unrelated issue as this change is only a tooling change that doesn't affect the payload.

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.

@openshift-ci
Copy link

openshift-ci bot commented Jan 16, 2026

@RadekManak: The following test 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-aws-ovn e83917e link true /test e2e-aws-ovn

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-merge-bot openshift-merge-bot bot merged commit f8b9cb0 into openshift:main Jan 16, 2026
13 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants