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

imagebuildah.StageExecutor: clean up volumes/volumeCache #5729

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

nalind
Copy link
Member

@nalind nalind commented Sep 9, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Clean up the distinctions between the volumes slice and the volumeCache and volumeCacheInfo maps so that --compat-volumes will work correctly when we're building with multiple layers.

How to verify it

Expanded integration tests!

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

The `buildah build` `--compat-excludes` flag will now how the intended effect when used in combination with `--layers`.

@openshift-ci openshift-ci bot added the approved label Sep 9, 2024
@nalind nalind force-pushed the compat-volumes-layers branch from 0a4b53a to 6221d1f Compare September 9, 2024 21:13
@nalind nalind force-pushed the compat-volumes-layers branch 2 times, most recently from 6ee59e6 to 2dce539 Compare September 10, 2024 13:56
@nalind nalind force-pushed the compat-volumes-layers branch from 2dce539 to 0a53800 Compare September 11, 2024 18:46
@rhatdan
Copy link
Member

rhatdan commented Sep 12, 2024

LGTM
@flouthoc PTAL

Clean up the distinctions between the volumes slice and the volumeCache
and volumeCacheInfo maps so that --compat-volumes will work correctly
when we're building with multiple layers.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@nalind nalind force-pushed the compat-volumes-layers branch from 0a53800 to 81d1256 Compare September 12, 2024 13:02
@rhatdan
Copy link
Member

rhatdan commented Sep 13, 2024

@giuseppe @mheon PTAL

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented Sep 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, nalind

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-merge-bot openshift-merge-bot bot merged commit bd12ae1 into containers:main Sep 13, 2024
32 checks passed
@nalind nalind deleted the compat-volumes-layers branch September 13, 2024 13:38
@nalind
Copy link
Member Author

nalind commented Sep 16, 2024

/cherry-pick release-1.37

@openshift-cherrypick-robot

@nalind: #5729 failed to apply on top of branch "release-1.37":

Applying: imagebuildah.StageExecutor: clean up volumes/volumeCache
Using index info to reconstruct a base tree...
M	cmd/buildah/build.go
M	imagebuildah/build.go
M	imagebuildah/executor.go
M	imagebuildah/stage_executor.go
M	tests/bud.bats
Falling back to patching base and 3-way merge...
Auto-merging tests/bud.bats
Auto-merging imagebuildah/stage_executor.go
CONFLICT (content): Merge conflict in imagebuildah/stage_executor.go
Auto-merging imagebuildah/executor.go
Auto-merging imagebuildah/build.go
Auto-merging cmd/buildah/build.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 imagebuildah.StageExecutor: clean up volumes/volumeCache
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.37

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 subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants