Skip to content

Move the COPY scriptes to below the RUN INSTALL_PKGS for sdn image #22502

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 17, 2019
Merged

Move the COPY scriptes to below the RUN INSTALL_PKGS for sdn image #22502

merged 1 commit into from
Apr 17, 2019

Conversation

JacobTanenbaum
Copy link
Contributor

somewhere in the build path for the sdn image iptables gets installed as a dependancey. If the scripts are copied into the image after we are assured that the iptables wrappers get used.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 8, 2019
@JacobTanenbaum
Copy link
Contributor Author

/retest

4 similar comments
@squeed
Copy link
Contributor

squeed commented Apr 9, 2019

/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

@squeed
Copy link
Contributor

squeed commented Apr 11, 2019 •
edited
Loading

Looks like it doesn't work:

cmd.go:114] Failed to start sdn: failed to set up iptables: failed to ensure rule [-d 10.128.0.0/14 -m comment --comment masquerade pod-to-external traffic -j RETURN] exists: error checking rule: exit status 2: Bad argument `pod-to-external'\nTry `iptables -h' or 'iptables --help' for more information.\n",

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 11, 2019
@JacobTanenbaum
Copy link
Contributor Author

/retest

4 similar comments
@dcbw
Copy link
Contributor

dcbw commented Apr 11, 2019

/retest

@dcbw
Copy link
Contributor

dcbw commented Apr 11, 2019

/retest

@dcbw
Copy link
Contributor

dcbw commented Apr 12, 2019

/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

@dcbw
Copy link
Contributor

dcbw commented Apr 12, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2019
@dcbw
Copy link
Contributor

dcbw commented Apr 12, 2019

@sdodson can you take a look at this one? Thanks!

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2019
@sdodson
Copy link
Member

sdodson commented Apr 12, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 12, 2019
@JacobTanenbaum
Copy link
Contributor Author

/retest

@squeed
Copy link
Contributor

squeed commented Apr 15, 2019 •
edited
Loading

Confirmed that the correct image is actually being e2e'd:

$ podman run --rm -ti --entrypoint=/bin/bash -v "/:/host/" registry.svc.ci.openshift.org/ci-op-7m1y10n6/stable@sha256:7926eac51d10a61606dd9cf00e29fc5786330d5a3394c28389817c9a66b4a089
[root@6254e2f66af3 /]# /usr/sbin/iptables --version
iptables v1.8.0 (legacy)

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 15, 2019
@JacobTanenbaum
Copy link
Contributor Author

/retest

1 similar comment
@JacobTanenbaum
Copy link
Contributor Author

/retest

@dcbw
Copy link
Contributor

dcbw commented Apr 15, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 15, 2019
@JacobTanenbaum
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@JacobTanenbaum
Copy link
Contributor Author

/test e2e-aws-serial

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@squeed
Copy link
Contributor

squeed commented Apr 16, 2019

@JacobTanenbaum all green, but looks like there's a conflict. Whee :-)

@JacobTanenbaum
Move the COPY scriptes to below the RUN INSTALL_PKGS for sdn image
5910195 
somewhere in the build path for the sdn image iptables gets installed as a dependancey. If the scripts are copied into the image after we are assured that the iptables wrappers get used as opposed to the iptables binary.

Change $@ to "$@" so that the arguments get passed to the iptables scripts correctly

Explicitly copy all the scripts as opposed to copying the whole directory with *
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2019
@JacobTanenbaum
Copy link
Contributor Author

/retest

3 similar comments
@JacobTanenbaum
Copy link
Contributor Author

/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

@squeed
Copy link
Contributor

squeed commented Apr 17, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 17, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, JacobTanenbaum, sdodson, squeed

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-robot openshift-merge-robot merged commit d8a0281 into openshift:master Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@giuseppe giuseppe Awaiting requested review from giuseppe

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@sdodson sdodson

@squeed squeed

@dcbw dcbw

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@JacobTanenbaum @squeed @dcbw @sdodson @openshift-bot @openshift-ci-robot @openshift-merge-robot