Merge pull request #8880 from mazdakn/fix-iptables-xdp

Upgrade bpftool to v7.4

Author: tomastigera

felix/docker-image/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2019 Tigera, Inc. All rights reserved.
+# Copyright (c) 2015-2024 Tigera, Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ ARG QEMU_IMAGE
 
 FROM ${QEMU_IMAGE} as qemu
 
-FROM calico/bpftool:v5.3-${TARGETARCH} as bpftool
+FROM calico/bpftool:v7.4.0 as bpftool
 
 FROM debian:11-slim as source
 

node/Dockerfile.amd64

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2022 Tigera, Inc. All rights reserved.
+# Copyright (c) 2015-2024 Tigera, Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ ARG RUNIT_VER=2.1.2
 ARG BIRD_IMAGE=calico/bird:latest
 ARG UBI_IMAGE
 
-FROM calico/bpftool:v5.3-amd64 as bpftool
+FROM calico/bpftool:v7.4.0 as bpftool
 FROM ${BIRD_IMAGE} as bird
 
 # Use this build stage to build iptables rpm and runit binaries.

node/Dockerfile.arm64

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2022 Tigera, Inc. All rights reserved.
+# Copyright (c) 2015-2024 Tigera, Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ ARG BIRD_IMAGE=calico/bird:latest
 ARG QEMU_IMAGE
 ARG UBI_IMAGE
 
-FROM calico/bpftool:v5.3-arm64 as bpftool
+FROM calico/bpftool:v7.4.0 as bpftool
 FROM ${QEMU_IMAGE} as qemu
 FROM ${BIRD_IMAGE} as bird
 

node/Dockerfile.ppc64le

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016,2021 Tigera, Inc. All rights reserved.
+# Copyright (c) 2015-2016,2021-2024 Tigera, Inc. All rights reserved.
 # Copyright IBM Corp. 2017
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@ ARG BIRD_IMAGE=calico/bird:latest
 FROM ${QEMU_IMAGE} as qemu
 FROM ${BIRD_IMAGE} as bird
 
-FROM calico/bpftool:v5.3-ppc64le as bpftool
+FROM calico/bpftool:v7.4.0 as bpftool
 
 FROM ppc64le/alpine:3.18
 

node/Dockerfile.s390x

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 Tigera, Inc. All rights reserved.
+# Copyright (c) 2015-2016,2024 Tigera, Inc. All rights reserved.
 # Copyright IBM Corp. 2017
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@ ARG BIRD_IMAGE
 FROM ${QEMU_IMAGE} as qemu
 FROM ${BIRD_IMAGE} as bird
 
-FROM calico/bpftool:v5.3-s390x as bpftool
+FROM calico/bpftool:v7.4.0 as bpftool
 
 FROM s390x/alpine:3.18 as base