Skip to content

Commit d67d40d

Browse files
authored
base: fix ovs patches (#2590)
1 parent ed14bc2 commit d67d40d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

dist/images/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax = docker/dockerfile:experimental
2-
FROM kubeovn/kube-ovn-base:v1.11.2
2+
FROM kubeovn/kube-ovn-base:v1.11.3
33

44
COPY *.sh /kube-ovn/
55
COPY kubectl-ko /kube-ovn/kubectl-ko

dist/images/Dockerfile.base

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ RUN cd /usr/src/ && \
1515
git clone -b branch-2.17 --depth=1 https://github.com/openvswitch/ovs.git && \
1616
cd ovs && \
1717
# ovsdb-idl: Support write-only-changed IDL monitor mode
18-
curl -s https://github.com/kubeovn/ovs/commit/03ce8faf7d0eb79d7dd99f4310dc15be160e92fc.patch | git apply && \
18+
curl -s https://github.com/kubeovn/ovs/commit/bef703ef862fbbf8740b8d5bf6ca8df9ed617da5.patch | git apply && \
1919
# fix memleak
20-
curl -s https://github.com/kubeovn/ovs/commit/2dc8e7aa202818952b2fa80b47298604530c9de0.patch | git apply && \
20+
curl -s https://github.com/kubeovn/ovs/commit/3cf5c5236494b5f54dd2c363f2b547f9d90b372d.patch | git apply && \
2121
# fix log file descriptor leak in monitor process
22-
curl -s https://github.com/kubeovn/ovs/commit/918d6dc79634bec760054ee53f7628186315bcfb.patch | git apply && \
22+
curl -s https://github.com/kubeovn/ovs/commit/9bce4a9bced0d699ebbb2893bc68448bb0243846.patch | git apply && \
2323
# increase election timer
24-
curl -s https://github.com/kubeovn/ovs/commit/22ea22c40b46ee5adeae977ff6cfca81b3ff25d7.patch | git apply && \
24+
curl -s https://github.com/kubeovn/ovs/commit/28ee0fc71cd4256fc422fff30d13e2aa0028cfca.patch | git apply && \
2525
# add fdb update logging
26-
curl -s https://github.com/kubeovn/ovs/commit/8c2f28b778129161bbf8f0738fa41d385860d5bc.patch | git apply && \
26+
curl -s https://github.com/kubeovn/ovs/commit/e3ed5ec298e2427b77dd2252e8c2218894e45220.patch | git apply && \
2727
# fdb: fix mac learning in environments with hairpin enabled
28-
curl -s https://github.com/kubeovn/ovs/commit/1cb138aaf2fdf922d75a587e4e9cf610d38f9fee.patch | git apply && \
28+
curl -s https://github.com/kubeovn/ovs/commit/b721a251dadfb0857a2aebe32611d18ca935421f.patch | git apply && \
2929
# ovsdb-tool: add optional server id parameter for "join-cluster" command
30-
curl -s https://github.com/kubeovn/ovs/commit/2e2ec1161cadbec79786d63fde9475053d996586.patch | git apply && \
30+
curl -s https://github.com/kubeovn/ovs/commit/0664cbe47d1684ca5b7147e3449779635454970e.patch | git apply && \
3131
# compile without avx512
32-
if [ "$ARCH" = "amd64" -a "$NO_AVX512" = "true" ]; then curl -s https://github.com/kubeovn/ovs/commit/c257b0794b827cfae9660a9f3238bee8a29e7676.patch | git apply; fi && \
32+
if [ "$ARCH" = "amd64" -a "$NO_AVX512" = "true" ]; then curl -s https://github.com/kubeovn/ovs/commit/f61283c8934589fe6de2b1e86041204dfc31a3e3.patch | git apply; fi && \
3333
./boot.sh && \
3434
rm -rf .git && \
3535
CONFIGURE_OPTS='' && \

0 commit comments

Comments
 (0)