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

Use mask definitions from containers/common @rhatdan #5111

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Oct 27, 2023

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

The /sys/devices/virtual/powercap is now masked over during builds.

@rhatdan
Copy link
Member Author

rhatdan commented Oct 27, 2023

@mheon PTAL

@mheon
Copy link
Member

mheon commented Oct 27, 2023

LGTM

"/proc/scsi",
"/proc/timer_list",
"/proc/timer_stats",
"/sys/dev/block",
Copy link
Member

Choose a reason for hiding this comment

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

This appears to allow the rest of /sys/dev, which we didn't before.

Copy link
Member Author

Choose a reason for hiding this comment

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

Podman switched from /sys/dev to /sys/dev/block a while ago. So I went with the Podman default.

Copy link
Member

Choose a reason for hiding this comment

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

Is it correct for build-time as well as run-time?

Copy link
Member Author

Choose a reason for hiding this comment

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

I would figure. Are concerned about access to content in /sys/dev? Note this is looser then buildah had before.

Copy link
Member

Choose a reason for hiding this comment

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

It being looser is what prompted my question. containers/podman#6957 masked all of /sys/dev without being more specific about what under it mattered, containers/podman#8408 narrowed the default to /sys/dev/block, and https://github.com/containers/podman/issues/12746 is asking to unmask the only part under it that we're still going to be masking.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, just going for consistency now.

@rhatdan
Copy link
Member Author

rhatdan commented Oct 30, 2023

@flouthoc @nalind @giuseppe @vrothberg PTAL

@flouthoc
Copy link
Collaborator

/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, rhatdan

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 merged commit d18a4f3 into containers:main Oct 30, 2023
35 checks passed
@nalind
Copy link
Member

nalind commented Oct 30, 2023

/cherry-pick release-1.32

@openshift-cherrypick-robot

@nalind: containers/podman#5111 failed to apply on top of branch "release-1.32":

Applying: Vendor in latest containers/common
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/containers/common/pkg/config/default.go
M	vendor/github.com/onsi/gomega/CHANGELOG.md
M	vendor/github.com/onsi/gomega/gomega_dsl.go
M	vendor/github.com/onsi/gomega/matchers.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/onsi/gomega/matchers.go
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/matchers.go
Auto-merging vendor/github.com/onsi/gomega/gomega_dsl.go
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/gomega_dsl.go
Auto-merging vendor/github.com/onsi/gomega/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/CHANGELOG.md
Auto-merging vendor/github.com/containers/common/pkg/config/default.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Vendor in latest containers/common
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.32

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.

mheon added a commit to mheon/buildah that referenced this pull request Oct 30, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

Signed-off-by: Matt Heon <[email protected]>
mheon added a commit to mheon/buildah that referenced this pull request Oct 30, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Oct 30, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Oct 30, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Oct 30, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Nov 1, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Nov 1, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Nov 1, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Nov 1, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/buildah that referenced this pull request Nov 2, 2023
This mimics containers#5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 29, 2024
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.

5 participants