diff --git a/build/images/deps/ovs-version b/build/images/deps/ovs-version index 728789a535a..17bbe1e98f5 100644 --- a/build/images/deps/ovs-version +++ b/build/images/deps/ovs-version @@ -1 +1 @@ -2.17.6 +2.17.7 diff --git a/build/images/ovs/Dockerfile b/build/images/ovs/Dockerfile index 8dc33e1828e..1ddd38dcc37 100644 --- a/build/images/ovs/Dockerfile +++ b/build/images/ovs/Dockerfile @@ -53,7 +53,11 @@ COPY charon-logging.conf /tmp # final image. RUN apt-get update && \ apt-get install -y --no-install-recommends iptables logrotate libstrongswan-standard-plugins && \ - (dpkg -i /tmp/ovs-debs/*.deb || apt-get -f -y --no-install-recommends install) && \ + # -f / --fix-broken will take care of installing all missing dependencies + apt-get -f -y --no-install-recommends install /tmp/ovs-debs/*.deb && \ + # make sure that openvswitch packages will not be upgraded by mistake + # in practice, the packages should not be upgraded anyway since they were installed using a .deb + apt-mark hold *openvswitch* && \ rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \ sed -i "/rotate /a\ #size 100M" /etc/logrotate.d/openvswitch-switch && \ sed -i "/^.*filelog.*{/r /tmp/charon-logging.conf" /etc/strongswan.d/charon-logging.conf && \ diff --git a/build/images/ovs/apply-patches.sh b/build/images/ovs/apply-patches.sh index 1c0355cde18..03fc8d8d0ec 100755 --- a/build/images/ovs/apply-patches.sh +++ b/build/images/ovs/apply-patches.sh @@ -42,8 +42,8 @@ function apply_patch() { git apply "$@" } -if version_lt "$OVS_VERSION" "2.13.0" || version_gt "$OVS_VERSION" "2.17.6"; then - echoerr "OVS_VERSION $OVS_VERSION is not supported (must be >= 2.13.0 and <= 2.17.6)" +if version_lt "$OVS_VERSION" "2.13.0" || version_gt "$OVS_VERSION" "2.17.7"; then + echoerr "OVS_VERSION $OVS_VERSION is not supported (must be >= 2.13.0 and <= 2.17.7)" exit 1 fi diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 80e717b96e4..a07377e9dcf 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -257,7 +257,7 @@ f06768ee-17ec-4abb-a971-b3b76abc8cda Port antrea-gw0 Interface antrea-gw0 type: internal - ovs_version: "2.17.6" + ovs_version: "2.17.7" ``` - `ovs-ofctl show br-int`: show OpenFlow information of the OVS bridge.