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

[BZ #2083997] pod: build pause image in custom user NS #14232

Merged
merged 1 commit into from May 16, 2022

Conversation

vrothberg
Copy link
Member

Use the host UID and host GID mapping when building the local pause
image for a Pod with a custom mapping. Otherwise, the mappings are off
and the build fails. Propagating the mapping to the build container is
not needed since the pause image ships merely a copied catatonit from
the host.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2083997
Signed-off-by: Valentin Rothberg vrothberg@redhat.com

Does this PR introduce a user-facing change?

Fix a bug where the pause image of a Pod with a custom ID mapping could not be built (https://bugzilla.redhat.com/show_bug.cgi?id=2083997).

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 13, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

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 May 13, 2022
@vrothberg
Copy link
Member Author

@giuseppe @rhatdan @TomSweeneyRedHat PTAL

@mheon FYI, probably a backport candidate for v4.1. Probably v4.0 (RHEL) if the council wishes.

@mheon
Copy link
Member

mheon commented May 13, 2022

LGTM, but your tests are red

Use the host UID and host GID mapping when building the local pause
image for a Pod with a custom mapping.  Otherwise, the mappings are off
and the build fails. Propagating the mapping to the build container is
not needed since the pause image ships merely a copied `catatonit` from
the host.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2083997
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@vrothberg
Copy link
Member Author

@rhatdan @TomSweeneyRedHat PTAL

@rhatdan
Copy link
Member

rhatdan commented May 16, 2022

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 16, 2022
@vrothberg
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2022
@vrothberg
Copy link
Member Author

/cherry-pick v4.1

@openshift-cherrypick-robot
Copy link
Collaborator

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

In response to this:

/cherry-pick v4.1

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.

@openshift-merge-robot openshift-merge-robot merged commit 0c71242 into containers:main May 16, 2022
@openshift-cherrypick-robot
Copy link
Collaborator

@vrothberg: #14232 failed to apply on top of branch "v4.1":

Applying: pod: build pause image in custom user NS
Using index info to reconstruct a base tree...
A	pkg/specgen/generate/pause_image.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/specgen/generate/pause_image.go deleted in HEAD and modified in pod: build pause image in custom user NS. Version pod: build pause image in custom user NS of pkg/specgen/generate/pause_image.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pod: build pause image in custom user NS
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 v4.1

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.

@vrothberg vrothberg deleted the bz-2083997 branch May 16, 2022 11:21
@edsantiago edsantiago added the kind/bug Categorizes issue or PR as related to a bug. label May 26, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants