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

Add --no-cleanup option to iptables-wrapper-installer.sh #9

Merged
merged 1 commit into from
Aug 19, 2024

Conversation

yoheiueda
Copy link
Contributor

Cache mounts of Docker builds are useful to share artifacts among multi-stage builds, but the cleanup mechanism of iptables-wrapper-installer.sh does not work well with cache mounts.

This patch adds a new option --no-cleanup to suppress cleanup of iptables-wrapper binary and iptables-wrapper-installer.sh.

We can use this option to build a container image with a cache mount as follows.

FROM golang:bookworm as builder

RUN git clone -b no-cleanup https://github.com/yoheiueda/iptables-wrappers.git /work
WORKDIR /work
RUN make BIN_DIR=/work build

FROM  debian:bookworm

RUN apt-get update && apt-get -y install iptables

RUN --mount=type=cache,target=/work,from=builder,source=/work,readonly \
	cd /work && ./iptables-wrapper-installer.sh --no-cleanup

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 16, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @yoheiueda!

It looks like this is your first PR to kubernetes-sigs/iptables-wrappers 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/iptables-wrappers has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 16, 2024
Copy link
Contributor

@danwinship danwinship left a comment

Choose a reason for hiding this comment

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

ok

shift
done

if [ -z "$no_sanity_check" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if [ -z "$no_sanity_check" ]; then
if [ -z "${no_sanity_check}" ]; then

for consistency. (Bash scripts in k8s always do it that way... I think the idea is that you need the braces in some cases (like if there's text that comes directly after the variable expansion with no space between them) and it's better/more consistent to just always use the braces.)

(likewise with no_cleanup below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

if [ -z "$no_cleanup" ]; then
mv "${iptables_wrapper_path}" "${sbin}/iptables-wrapper"
else
cp "${iptables_wrapper_path}" "${sbin}/iptables-wrapper"
Copy link
Contributor

Choose a reason for hiding this comment

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

You could also just always do "cp" rather than "mv" here, and then rm the original in the "# Cleanup" section below

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

This patch adds an option to suppress cleanup of iptables-wrapper
binary and iptables-wrapper-installer.sh.

We need this option when we build a container image by invoking
iptables-wrapper-installer.sh from a read-only cache mount.

Signed-off-by: Yohei Ueda <[email protected]>
@danwinship
Copy link
Contributor

/lgtm
/approve

thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, yoheiueda

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2024
@k8s-ci-robot k8s-ci-robot merged commit 06cad2e into kubernetes-sigs:master Aug 19, 2024
2 checks passed
@yoheiueda yoheiueda deleted the no-cleanup branch December 3, 2024 13:35
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants