-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
dind: fix token race, enable GENEVE UDP port, and update OVN repo #16311
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/unassign |
images/dind/node/Dockerfile
Outdated
@@ -31,7 +31,7 @@ RUN dnf -y update && dnf -y install\ | |||
# with the newer release. (This can go away when the base image is upgraded to | |||
# OVS 2.8 prerelease or release versions and include OVN sub-packages) | |||
RUN dnf -y install dnf-plugins-core &&\ | |||
dnf -y copr enable leifmadsen/ovs-master &&\ | |||
dnf -y copr enable danw/origin-dind-ovs-master &&\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What OVS do you need that's not in the CentOS PaaS SIG repos we're using elsewhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something relatively recent; OVS 2.8 (for some conntrack stuff) + OVN sub-packages (for OVN obviously). We need to wait for F26 to get moved to OVN 2.8, and then we'll get both 2.8 and the OVN sub-packages when we switch the DIND images to F26 base.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, and the DIND images are based on Fedora, not CentOS, so...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, let me move the build from danw/origin-dind-ovs-master over to danw/origin-dind-ovs and we can use that. I don't plan to keep that COPR up to date with OVS master so it's just confusing to have "master" in the name.
We need to wait for F26 to get moved to OVS 2.8
I'm not sure there's any plan to do that... I think we're waiting for F27 at this point. (This OVS build is a rebuild of the current rawhide RPM.)
Oh, and the DIND images are based on Fedora, not CentOS, so...
FWIW I have a branch that switches dind over to CentOS (a spinoff of the old ansible-install-into-dind work). It makes things slightly less convenient since some packages you might want for debugging aren't available on CentOS (and even with EPEL you're still getting much older versions of things). But maybe it's a net improvement because it's more like real OCP environments?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, sounds good. We have had stability issues with COPRs in the past, so I just want to make sure we are not inviting flakiness in with this approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, let me move the build from danw/origin-dind-ovs-master over to danw/origin-dind-ovs and we can use that.
(this is done)
/test integration issue #16312 |
yay imagestream breakage! /test extended_conformance_gce |
8779dce
to
7791847
Compare
images/dind/node/Dockerfile
Outdated
@@ -31,7 +31,7 @@ RUN dnf -y update && dnf -y install\ | |||
# with the newer release. (This can go away when the base image is upgraded to | |||
# OVS 2.8 prerelease or release versions and include OVN sub-packages) | |||
RUN dnf -y install dnf-plugins-core &&\ | |||
dnf -y copr enable leifmadsen/ovs-master &&\ | |||
dnf -y copr enable danw/origin-dind-ovs-master &&\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, let me move the build from danw/origin-dind-ovs-master over to danw/origin-dind-ovs and we can use that. I don't plan to keep that COPR up to date with OVS master so it's just confusing to have "master" in the name.
We need to wait for F26 to get moved to OVS 2.8
I'm not sure there's any plan to do that... I think we're waiting for F27 at this point. (This OVS build is a rebuild of the current rawhide RPM.)
Oh, and the DIND images are based on Fedora, not CentOS, so...
FWIW I have a branch that switches dind over to CentOS (a spinoff of the old ansible-install-into-dind work). It makes things slightly less convenient since some packages you might want for debugging aren't available on CentOS (and even with EPEL you're still getting much older versions of things). But maybe it's a net improvement because it's more like real OCP environments?
7791847
to
bd775a4
Compare
@danwinship updated the COPR repo path |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danwinship, dcbw, rajatchopra The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
/test extended_conformance_install_update |
/retest Please review the full test history for this PR and help us cut down flakes. |
Automatic merge from submit-queue |
@danwinship @stevekuznetsov @rajatchopra