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.

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

Automated cherry pick of #5225: Upgrade OVS to 2.17.7 #5233

Closed
wants to merge 1 commit into from
Closed

Automated cherry pick of #5225: Upgrade OVS to 2.17.7 #5233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/images/deps/ovs-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.17.6
2.17.7
6 changes: 5 additions & 1 deletion build/images/ovs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions build/images/ovs/apply-patches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/troubleshooting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading