Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not set dockerfile parameter to an empty string to align with behavior of alpha controller #1569

Conversation

SaschaSchwarze0
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 commented Apr 4, 2024

Changes

When the Build controller still reconciled the Alpha version of Builds, it handled spec.dockerfile here: https://github.com/shipwright-io/build/blob/v0.12.0/pkg/reconciler/buildrun/resources/taskrun.go#L361-L369.

Basically if the value was nil, the parameter value was not added. With that, its default value, "Dockerfile" was used. https://github.com/shipwright-io/build/blob/v0.12.0/pkg/reconciler/buildrun/resources/taskrun.go#L74-L81

Suddenly, this was also happening when the spec.dockerfile was set to an empty string.

To mimic the same behavior with the conversion to Beta, I am changing our conversion code to behave the same = not adding the parameter value to be an empty string.

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

Release Notes

An Alpha Build where `spec.dockerfile` is set to `""`, is now transformed to a Beta Build without the dockerfile parameter to behave like in Alpha

@SaschaSchwarze0 SaschaSchwarze0 added the kind/bug Categorizes issue or PR as related to a bug. label Apr 4, 2024
@SaschaSchwarze0 SaschaSchwarze0 added this to the release-v0.14.0 milestone Apr 4, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 4, 2024
@openshift-ci openshift-ci bot added the release-note Label for when a PR has specified a release note label Apr 4, 2024
@qu1queee qu1queee self-requested a review April 4, 2024 13:28
Copy link
Contributor

@qu1queee qu1queee 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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 4, 2024
Copy link
Contributor

@HeavyWombat HeavyWombat left a comment

Choose a reason for hiding this comment

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

/lgtm

@HeavyWombat
Copy link
Contributor

/approve

Copy link
Contributor

openshift-ci bot commented Apr 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HeavyWombat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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 Apr 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 8b1cbe2 into shipwright-io:main Apr 4, 2024
13 checks passed
@SaschaSchwarze0 SaschaSchwarze0 deleted the sascha-correct-dockerfile-migration branch April 4, 2024 15:50
@adambkaplan
Copy link
Member

/cherrypick release-v0.13

@openshift-cherrypick-robot

@adambkaplan: new pull request created: #1591

In response to this:

/cherrypick release-v0.13

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/test-infra repository.

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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Label for when a PR has specified a release note size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants