diff --git a/Dockerfile b/Dockerfile index a11101122d..c4ed53e5d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,9 @@ RUN INSTALL_PKGS=" \ eval "dnf install -y --nodocs $(cat /more-pkgs)" && \ dnf clean all && rm -rf /var/cache/* +COPY libreswan-4.9-5.el9_2.3.x86_64.rpm /root/ +RUN rpm -Uhv --nodeps --force /root/libreswan*.rpm + COPY --from=builder /go/src/github.com/openshift/ovn-kubernetes/go-controller/_output/go/bin/ovnkube /usr/bin/ COPY --from=builder /go/src/github.com/openshift/ovn-kubernetes/go-controller/_output/go/bin/ovnkube-identity /usr/bin/ COPY --from=builder /go/src/github.com/openshift/ovn-kubernetes/go-controller/_output/go/bin/ovn-kube-util /usr/bin/ diff --git a/Dockerfile.base b/Dockerfile.base index 5fb80b1fa8..706ae208d5 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -15,17 +15,20 @@ RUN dnf install -y --nodocs \ ARG ovsver=3.1.0-88.el9fdp ARG ovnver=23.09.4-16.el9fdp +COPY openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm openvswitch3.1-devel-3.1.0-bug41551.137.el9fdp.x86_64.rpm openvswitch3.1-ipsec-3.1.0-bug41551.137.el9fdp.x86_64.rpm python3-openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm /root/ + RUN INSTALL_PKGS="iptables" && \ ovsver_short=$(echo "$ovsver" | cut -d'.' -f1,2) && \ ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \ dnf install -y --nodocs $INSTALL_PKGS && \ dnf install -y --nodocs "openvswitch$ovsver_short = $ovsver" "python3-openvswitch$ovsver_short = $ovsver" && \ + rpm -Uhv --nodeps --force /root/openvswitch3.1*.rpm && \ dnf install -y --nodocs "ovn$ovnver_short = $ovnver" "ovn$ovnver_short-central = $ovnver" "ovn$ovnver_short-host = $ovnver" && \ dnf clean all && rm -rf /var/cache/* RUN ovsver_short=$(echo "$ovsver" | cut -d'.' -f1,2) && \ ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \ - sed 's/%/"/g' <<<"%openvswitch$ovsver_short-devel = $ovsver% %openvswitch$ovsver_short-ipsec = $ovsver% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs + sed 's/%/"/g' <<<"%ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs RUN mkdir -p /var/run/openvswitch && \ mkdir -p /var/run/ovn && \ diff --git a/libreswan-4.12-2.el9_4.1.x86_64.rpm b/libreswan-4.12-2.el9_4.1.x86_64.rpm new file mode 100644 index 0000000000..3191928380 Binary files /dev/null and b/libreswan-4.12-2.el9_4.1.x86_64.rpm differ diff --git a/libreswan-4.15-3.el9.x86_64.rpm b/libreswan-4.15-3.el9.x86_64.rpm new file mode 100644 index 0000000000..9b69aa603e Binary files /dev/null and b/libreswan-4.15-3.el9.x86_64.rpm differ diff --git a/libreswan-4.5-1.0dbac4070.el9_2.x86_64.rpm b/libreswan-4.5-1.0dbac4070.el9_2.x86_64.rpm new file mode 100644 index 0000000000..252617c831 Binary files /dev/null and b/libreswan-4.5-1.0dbac4070.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.0fa145b49.el9_2.x86_64.rpm b/libreswan-4.5-1.0fa145b49.el9_2.x86_64.rpm new file mode 100644 index 0000000000..8855e5bbc9 Binary files /dev/null and b/libreswan-4.5-1.0fa145b49.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.3757da46a.el9_2.x86_64.rpm b/libreswan-4.5-1.3757da46a.el9_2.x86_64.rpm new file mode 100644 index 0000000000..998ade55c6 Binary files /dev/null and b/libreswan-4.5-1.3757da46a.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.41140e340.el9_2.x86_64.rpm b/libreswan-4.5-1.41140e340.el9_2.x86_64.rpm new file mode 100644 index 0000000000..42c67301ab Binary files /dev/null and b/libreswan-4.5-1.41140e340.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.4d4b940b2.el9_2.x86_64.rpm b/libreswan-4.5-1.4d4b940b2.el9_2.x86_64.rpm new file mode 100644 index 0000000000..4109fe0eb1 Binary files /dev/null and b/libreswan-4.5-1.4d4b940b2.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.5b6fb4556.el9_2.x86_64.rpm b/libreswan-4.5-1.5b6fb4556.el9_2.x86_64.rpm new file mode 100644 index 0000000000..0b3cace019 Binary files /dev/null and b/libreswan-4.5-1.5b6fb4556.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.5e1673820.el9_2.x86_64.rpm b/libreswan-4.5-1.5e1673820.el9_2.x86_64.rpm new file mode 100644 index 0000000000..e7758df62d Binary files /dev/null and b/libreswan-4.5-1.5e1673820.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.6341e0d02.el9_2.x86_64.rpm b/libreswan-4.5-1.6341e0d02.el9_2.x86_64.rpm new file mode 100644 index 0000000000..b004c9aa70 Binary files /dev/null and b/libreswan-4.5-1.6341e0d02.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.691b37ccb.el9_2.x86_64.rpm b/libreswan-4.5-1.691b37ccb.el9_2.x86_64.rpm new file mode 100644 index 0000000000..5db1fc15e3 Binary files /dev/null and b/libreswan-4.5-1.691b37ccb.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.c9886a96d.el9_2.x86_64.rpm b/libreswan-4.5-1.c9886a96d.el9_2.x86_64.rpm new file mode 100644 index 0000000000..50b8e96a8b Binary files /dev/null and b/libreswan-4.5-1.c9886a96d.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.el9_2.x86_64.rpm b/libreswan-4.5-1.el9_2.x86_64.rpm new file mode 100644 index 0000000000..9d75d0b4e0 Binary files /dev/null and b/libreswan-4.5-1.el9_2.x86_64.rpm differ diff --git a/libreswan-4.5-1.fec6eedd2.el9_2.x86_64.rpm b/libreswan-4.5-1.fec6eedd2.el9_2.x86_64.rpm new file mode 100644 index 0000000000..4f748c3c04 Binary files /dev/null and b/libreswan-4.5-1.fec6eedd2.el9_2.x86_64.rpm differ diff --git a/libreswan-4.6-3.el9_0.2.x86_64.rpm b/libreswan-4.6-3.el9_0.2.x86_64.rpm new file mode 100644 index 0000000000..7c2185bd44 Binary files /dev/null and b/libreswan-4.6-3.el9_0.2.x86_64.rpm differ diff --git a/libreswan-4.9-5.el9_2.3.x86_64.rpm b/libreswan-4.9-5.el9_2.3.x86_64.rpm new file mode 100644 index 0000000000..b9bd3b7423 Binary files /dev/null and b/libreswan-4.9-5.el9_2.3.x86_64.rpm differ diff --git a/openvswitch3.1-3.1.0-bug41551.135.el9fdp.x86_64.rpm b/openvswitch3.1-3.1.0-bug41551.135.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..48a2a223c6 Binary files /dev/null and b/openvswitch3.1-3.1.0-bug41551.135.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-3.1.0-bug41551.136.el9fdp.x86_64.rpm b/openvswitch3.1-3.1.0-bug41551.136.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..8f31d85f70 Binary files /dev/null and b/openvswitch3.1-3.1.0-bug41551.136.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm b/openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..33f49dd7a6 Binary files /dev/null and b/openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-devel-3.1.0-bug41551.135.el9fdp.x86_64.rpm b/openvswitch3.1-devel-3.1.0-bug41551.135.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..b683418f6a Binary files /dev/null and b/openvswitch3.1-devel-3.1.0-bug41551.135.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-devel-3.1.0-bug41551.136.el9fdp.x86_64.rpm b/openvswitch3.1-devel-3.1.0-bug41551.136.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..819c71e897 Binary files /dev/null and b/openvswitch3.1-devel-3.1.0-bug41551.136.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-devel-3.1.0-bug41551.137.el9fdp.x86_64.rpm b/openvswitch3.1-devel-3.1.0-bug41551.137.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..2cd08ada21 Binary files /dev/null and b/openvswitch3.1-devel-3.1.0-bug41551.137.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-ipsec-3.1.0-bug41551.135.el9fdp.x86_64.rpm b/openvswitch3.1-ipsec-3.1.0-bug41551.135.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..0d8a08ba5b Binary files /dev/null and b/openvswitch3.1-ipsec-3.1.0-bug41551.135.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-ipsec-3.1.0-bug41551.136.el9fdp.x86_64.rpm b/openvswitch3.1-ipsec-3.1.0-bug41551.136.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..375f979ca6 Binary files /dev/null and b/openvswitch3.1-ipsec-3.1.0-bug41551.136.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-ipsec-3.1.0-bug41551.137.el9fdp.x86_64.rpm b/openvswitch3.1-ipsec-3.1.0-bug41551.137.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..79fe12973c Binary files /dev/null and b/openvswitch3.1-ipsec-3.1.0-bug41551.137.el9fdp.x86_64.rpm differ diff --git a/openvswitch3.1-test-3.1.0-bug41551.135.el9fdp.noarch.rpm b/openvswitch3.1-test-3.1.0-bug41551.135.el9fdp.noarch.rpm new file mode 100644 index 0000000000..add0fa39dd Binary files /dev/null and b/openvswitch3.1-test-3.1.0-bug41551.135.el9fdp.noarch.rpm differ diff --git a/openvswitch3.1-test-3.1.0-bug41551.136.el9fdp.noarch.rpm b/openvswitch3.1-test-3.1.0-bug41551.136.el9fdp.noarch.rpm new file mode 100644 index 0000000000..6cd1599840 Binary files /dev/null and b/openvswitch3.1-test-3.1.0-bug41551.136.el9fdp.noarch.rpm differ diff --git a/openvswitch3.1-test-3.1.0-bug41551.137.el9fdp.noarch.rpm b/openvswitch3.1-test-3.1.0-bug41551.137.el9fdp.noarch.rpm new file mode 100644 index 0000000000..5399ff5415 Binary files /dev/null and b/openvswitch3.1-test-3.1.0-bug41551.137.el9fdp.noarch.rpm differ diff --git a/python3-openvswitch3.1-3.1.0-bug41551.135.el9fdp.x86_64.rpm b/python3-openvswitch3.1-3.1.0-bug41551.135.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..8919523373 Binary files /dev/null and b/python3-openvswitch3.1-3.1.0-bug41551.135.el9fdp.x86_64.rpm differ diff --git a/python3-openvswitch3.1-3.1.0-bug41551.136.el9fdp.x86_64.rpm b/python3-openvswitch3.1-3.1.0-bug41551.136.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..1edcbfc82e Binary files /dev/null and b/python3-openvswitch3.1-3.1.0-bug41551.136.el9fdp.x86_64.rpm differ diff --git a/python3-openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm b/python3-openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..d347f7a2a2 Binary files /dev/null and b/python3-openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm differ