Skip to content

Rename VERSION to OADP_VERSION in konflux.Dockerfile#184

Merged
openshift-merge-bot[bot] merged 2 commits into
migtools:oadp-devfrom
Joeavaikath:fix-konflux-version-arg
May 4, 2026
Merged

Rename VERSION to OADP_VERSION in konflux.Dockerfile#184
openshift-merge-bot[bot] merged 2 commits into
migtools:oadp-devfrom
Joeavaikath:fix-konflux-version-arg

Conversation

@Joeavaikath
Copy link
Copy Markdown
Contributor

@Joeavaikath Joeavaikath commented May 4, 2026

Summary

  • Konflux auto-injects VERSION as the Go toolchain version from the builder image (e.g. 1.25), which collides with our VERSION build arg used for buildinfo.Version ldflags
  • This causes oc oadp version to report Version: 1.25 (the Go version) instead of the actual OADP version
  • Renames the build arg to OADP_VERSION to avoid the collision
  • Release branches should hardcode the value (e.g. OADP_VERSION=v1.6.0) after cherry-picking

Test plan

  • Verify Konflux build produces binary with Version: dev (not 1.25)
  • After cherry-pick to release branch with hardcoded version, verify oc oadp version shows correct version

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Chores
    • Updated build configuration to resolve variable naming conflicts during the build process.

Konflux auto-injects VERSION as the Go toolchain version from the
builder image (e.g. 1.25), which collides with our VERSION build arg
used for buildinfo.Version. This causes the CLI to report the Go
version instead of the OADP version.

Rename to OADP_VERSION to avoid the collision. Release branches
should hardcode the appropriate version (e.g. v1.6.0).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 4, 2026

Warning

Rate limit exceeded

@Joeavaikath has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 54 minutes and 5 seconds before requesting another review.

To keep reviews running without waiting, you can enable usage-based add-on for your organization. This allows additional reviews beyond the hourly cap. Account admins can enable it under billing.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: f3734b70-1d5e-4135-8353-04c2f8dca602

📥 Commits

Reviewing files that changed from the base of the PR and between fd22d1a and f92b9ef.

📒 Files selected for processing (1)
  • Containerfile.download
📝 Walkthrough

Walkthrough

The PR renames the Dockerfile build argument from VERSION to OADP_VERSION and updates the corresponding ldflags reference. This avoids collision with Konflux-injected environment variables while maintaining version embedding in the Velero binary.

Changes

Build Argument Rename

Layer / File(s) Summary
Build Configuration
konflux.Dockerfile
ARG VERSION=dev renamed to ARG OADP_VERSION=dev with a comment explaining collision avoidance. The -ldflags value for github.com/vmware-tanzu/velero/pkg/buildinfo.Version updated to reference ${OADP_VERSION} instead of ${VERSION}.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

Suggested labels

approved, lgtm

Suggested reviewers

  • mpryc
  • kaovilai
  • sseago

Poem

🐰 A version once tangled, now bright,
OADP takes hold in the light,
No collision, no fuss,
The Dockerfile's just,
Velero's built clean—all is right!

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely summarizes the main change: renaming VERSION to OADP_VERSION in konflux.Dockerfile.
Description check ✅ Passed The description provides comprehensive context including the problem (VERSION collision with Konflux), the solution (renaming to OADP_VERSION), and a detailed test plan, matching the required template structure.
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.

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

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

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
Review rate limit: 0/1 reviews remaining, refill in 54 minutes and 5 seconds.

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

Keep consistent with konflux.Dockerfile change.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@Joeavaikath
Copy link
Copy Markdown
Contributor Author

/cherry-pick oadp-1.6

@openshift-cherrypick-robot
Copy link
Copy Markdown

@Joeavaikath: once the present PR merges, I will cherry-pick it on top of oadp-1.6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick oadp-1.6

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.

Copy link
Copy Markdown
Member

@shubham-pampattiwar shubham-pampattiwar left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Joeavaikath, shubham-pampattiwar, weshayutin

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:
  • OWNERS [Joeavaikath,shubham-pampattiwar,weshayutin]

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 lgtm label May 4, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 0c82a2f into migtools:oadp-dev May 4, 2026
13 checks passed
@openshift-cherrypick-robot
Copy link
Copy Markdown

@Joeavaikath: new pull request created: #185

Details

In response to this:

/cherry-pick oadp-1.6

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.

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.

4 participants