diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index 3cb38aa6370..2d5b5eae09d 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -7,7 +7,7 @@ FROM ghcr.io/aquasecurity/trivy:latest AS trivy ARG ARCH ENV CNI_VERSION="v1.5.1" ENV KUBE_VERSION="v1.31.1" -ENV GOBGP_VERSION="3.33.0" +ENV GOBGP_VERSION="3.34.0" ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2" RUN apk --no-cache add curl jq @@ -122,16 +122,16 @@ FROM ubuntu:22.04 ARG ARCH ARG DEBIAN_FRONTEND=noninteractive RUN apt update && apt upgrade -y && apt install ca-certificates python3 hostname libunwind8 netbase \ - ethtool iproute2 ncat libunbound8 procps libatomic1 kmod iptables python3-netifaces python3-sortedcontainers \ - tcpdump ipvsadm ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 conntrack traceroute iputils-tracepath \ - logrotate dnsutils net-tools strongswan strongswan-pki libcharon-extra-plugins libmnl0 \ - libcharon-extauth-plugins libstrongswan-extra-plugins libstrongswan-standard-plugins -y --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /etc/localtime && \ - rm -f /usr/bin/nc && \ - rm -f /usr/bin/netcat && \ - rm -f /usr/lib/apt/methods/mirror && \ - deluser sync + ethtool iproute2 ncat libunbound8 procps libatomic1 kmod iptables python3-netifaces python3-sortedcontainers \ + tcpdump ipvsadm ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 conntrack traceroute iputils-tracepath \ + logrotate dnsutils net-tools strongswan strongswan-pki libcharon-extra-plugins libmnl0 \ + libcharon-extauth-plugins libstrongswan-extra-plugins libstrongswan-standard-plugins -y --no-install-recommends && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /etc/localtime && \ + rm -f /usr/bin/nc && \ + rm -f /usr/bin/netcat && \ + rm -f /usr/lib/apt/methods/mirror && \ + deluser sync RUN mkdir -p /var/run/openvswitch && \ mkdir -p /var/run/ovn && \ @@ -163,9 +163,9 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \ rm -rf /var/lib/openvswitch/pki/ && \ chown -R nobody: /var/lib/logrotate && \ if [ "${DEBUG}" = "true" ]; then \ - apt update && apt install -y --no-install-recommends gdb valgrind && \ - rm -rf /var/lib/apt/lists/* && \ - dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/*.ddeb; \ + apt update && apt install -y --no-install-recommends gdb valgrind && \ + rm -rf /var/lib/apt/lists/* && \ + dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/*.ddeb; \ fi ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/dist/images/go-deps/download-go-deps.sh b/dist/images/go-deps/download-go-deps.sh index a9d01e486eb..7d17654fdc4 100644 --- a/dist/images/go-deps/download-go-deps.sh +++ b/dist/images/go-deps/download-go-deps.sh @@ -5,7 +5,7 @@ set -e ARCH=${ARCH:-amd64} CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.5.1} KUBECTL_VERSION=${KUBECTL_VERSION:-v1.31.3} -GOBGP_VERSION=${GOBGP_VERSION:-3.33.0} +GOBGP_VERSION=${GOBGP_VERSION:-3.34.0} DEPS_DIR=/godeps diff --git a/go.mod b/go.mod index acc1e112a06..a002f2c98f8 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/moby/sys/mountinfo v0.7.2 github.com/onsi/ginkgo/v2 v2.21.0 github.com/onsi/gomega v1.35.1 - github.com/osrg/gobgp/v3 v3.33.0 + github.com/osrg/gobgp/v3 v3.34.0 github.com/ovn-org/libovsdb v0.7.0 github.com/parnurzeal/gorequest v0.3.0 github.com/prometheus-community/pro-bing v0.4.1 diff --git a/go.sum b/go.sum index 8d282b23403..9d55ec22175 100644 --- a/go.sum +++ b/go.sum @@ -1122,8 +1122,8 @@ github.com/openshift/client-go v0.0.1/go.mod h1:I8qTI1lgErsWc6CVukSjP1PYqpafE7fu github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4= github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA= github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= -github.com/osrg/gobgp/v3 v3.33.0 h1:G8NlY1gzz0DOfiwfiYv2++vWpPLm+CMAKYRVzSmaJow= -github.com/osrg/gobgp/v3 v3.33.0/go.mod h1:8m+kgkdaWrByxg5EWpNUO2r/mopodrNBOUBhMnW/yGQ= +github.com/osrg/gobgp/v3 v3.34.0 h1:DDIWsAIE7j1dwhSV3tGsTKs9OO8MTOS4atErebZxTtA= +github.com/osrg/gobgp/v3 v3.34.0/go.mod h1:l2nPaHaLmIoKbFxMUzKon/h6c9BTzCp5zJI9Dhnrx5c= github.com/parnurzeal/gorequest v0.3.0 h1:SoFyqCDC9COr1xuS6VA8fC8RU7XyrJZN2ona1kEX7FI= github.com/parnurzeal/gorequest v0.3.0/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=