From 935bc36dc46351dea749385231a6fe18c128108f Mon Sep 17 00:00:00 2001 From: Ethan Ermovick Date: Mon, 14 Sep 2026 11:33:49 -0400 Subject: [PATCH] test: wait for Linux datapath pods to be deleted --- .../build/dockerfiles/azure-ip-masq-merger.Dockerfile | 2 +- .pipelines/build/dockerfiles/azure-ipam.Dockerfile | 2 +- .../build/dockerfiles/azure-iptables-monitor.Dockerfile | 4 ++-- .pipelines/build/dockerfiles/cni.Dockerfile | 2 +- .pipelines/build/dockerfiles/cns.Dockerfile | 4 ++-- azure-ip-masq-merger/Dockerfile | 4 ++-- azure-ipam/Dockerfile | 6 +++--- azure-iptables-monitor/Dockerfile | 6 +++--- cilium-log-collector/Dockerfile | 2 +- cni/Dockerfile | 6 +++--- cns/Dockerfile | 6 +++--- hack/aks/deploy.mk | 4 ++-- test/integration/datapath/datapath_linux_test.go | 6 ++++++ 13 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile b/.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile index 565c40fb3d1..b9ebc90feb3 100644 --- a/.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile +++ b/.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile @@ -3,7 +3,7 @@ ARG ARCH # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS linux +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS linux ARG ARTIFACT_DIR COPY ${ARTIFACT_DIR}/bin/azure-ip-masq-merger /azure-ip-masq-merger diff --git a/.pipelines/build/dockerfiles/azure-ipam.Dockerfile b/.pipelines/build/dockerfiles/azure-ipam.Dockerfile index 65e738d6de2..505de8383ad 100644 --- a/.pipelines/build/dockerfiles/azure-ipam.Dockerfile +++ b/.pipelines/build/dockerfiles/azure-ipam.Dockerfile @@ -12,7 +12,7 @@ COPY ${ARTIFACT_DIR}/files/azilium.conflist /Windows/System32/azilium.conflist ENTRYPOINT [ "powershell.exe" ] # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS linux +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS linux ARG ARTIFACT_DIR . COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz diff --git a/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile b/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile index d430ad810a3..15c06c08d3e 100644 --- a/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile +++ b/.pipelines/build/dockerfiles/azure-iptables-monitor.Dockerfile @@ -3,10 +3,10 @@ ARG ARCH # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core +FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:34a22db497ff34a0f35ca5fc54bd38711d04238a2c1b2f65d35dc9d45dd82584 AS mariner-core # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless +FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS mariner-distroless FROM mariner-core AS iptools RUN tdnf install -y iptables iproute diff --git a/.pipelines/build/dockerfiles/cni.Dockerfile b/.pipelines/build/dockerfiles/cni.Dockerfile index 5697996b2a5..51f410ae909 100644 --- a/.pipelines/build/dockerfiles/cni.Dockerfile +++ b/.pipelines/build/dockerfiles/cni.Dockerfile @@ -11,7 +11,7 @@ COPY ${ARTIFACT_DIR}/files/ /Windows/System32/ ENTRYPOINT [ "powershell.exe" ] # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS linux +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS linux ARG ARTIFACT_DIR . COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz diff --git a/.pipelines/build/dockerfiles/cns.Dockerfile b/.pipelines/build/dockerfiles/cns.Dockerfile index ec2ef3c5e90..3f375d7dc1f 100644 --- a/.pipelines/build/dockerfiles/cns.Dockerfile +++ b/.pipelines/build/dockerfiles/cns.Dockerfile @@ -11,11 +11,11 @@ ENTRYPOINT ["azure-cns.exe"] EXPOSE 10090 # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS build-helper +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:34a22db497ff34a0f35ca5fc54bd38711d04238a2c1b2f65d35dc9d45dd82584 AS build-helper RUN tdnf install -y iptables # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS linux +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS linux ARG ARTIFACT_DIR . COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/ diff --git a/azure-ip-masq-merger/Dockerfile b/azure-ip-masq-merger/Dockerfile index c66cfb77aa4..fbd7ceb2785 100644 --- a/azure-ip-masq-merger/Dockerfile +++ b/azure-ip-masq-merger/Dockerfile @@ -4,10 +4,10 @@ ARG ARCH ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:3c78e9858004d1c43aea08829306c76c3bf870c26b98c8c07ea6ca74c54787cf AS go # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS mariner-distroless FROM go AS azure-ip-masq-merger ARG OS diff --git a/azure-ipam/Dockerfile b/azure-ipam/Dockerfile index 7ebf43e6f83..6c3ec643602 100644 --- a/azure-ipam/Dockerfile +++ b/azure-ipam/Dockerfile @@ -6,13 +6,13 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:3c78e9858004d1c43aea08829306c76c3bf870c26b98c8c07ea6ca74c54787cf AS go # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:34a22db497ff34a0f35ca5fc54bd38711d04238a2c1b2f65d35dc9d45dd82584 AS mariner-core # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS mariner-distroless FROM go AS azure-ipam ARG OS diff --git a/azure-iptables-monitor/Dockerfile b/azure-iptables-monitor/Dockerfile index f6e9d5f2512..38150abd727 100644 --- a/azure-iptables-monitor/Dockerfile +++ b/azure-iptables-monitor/Dockerfile @@ -3,13 +3,13 @@ ARG ARCH # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core +FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:34a22db497ff34a0f35ca5fc54bd38711d04238a2c1b2f65d35dc9d45dd82584 AS mariner-core # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless +FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS mariner-distroless # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:3c78e9858004d1c43aea08829306c76c3bf870c26b98c8c07ea6ca74c54787cf AS go FROM go AS azure-iptables-monitor diff --git a/cilium-log-collector/Dockerfile b/cilium-log-collector/Dockerfile index 498b6731a5d..05feb5651f6 100644 --- a/cilium-log-collector/Dockerfile +++ b/cilium-log-collector/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:3c78e9858004d1c43aea08829306c76c3bf870c26b98c8c07ea6ca74c54787cf AS go FROM go AS fluent-bit-plugin ARG VERSION diff --git a/cni/Dockerfile b/cni/Dockerfile index a5b933caf10..a6f8549115f 100644 --- a/cni/Dockerfile +++ b/cni/Dockerfile @@ -6,13 +6,13 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:3c78e9858004d1c43aea08829306c76c3bf870c26b98c8c07ea6ca74c54787cf AS go # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core:3.0@sha256:34a22db497ff34a0f35ca5fc54bd38711d04238a2c1b2f65d35dc9d45dd82584 AS mariner-core # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless +FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS mariner-distroless FROM go AS azure-vnet ARG OS diff --git a/cns/Dockerfile b/cns/Dockerfile index 521a36fd2d0..56cad017db2 100644 --- a/cns/Dockerfile +++ b/cns/Dockerfile @@ -5,13 +5,13 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:829285f9358799b5b9bfb48ee11e604d09b6d7fb7bf5acc22a86f77149fd82e6 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0@sha256:3c78e9858004d1c43aea08829306c76c3bf870c26b98c8c07ea6ca74c54787cf AS go # mcr.microsoft.com/azurelinux/base/core:3.0 -FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:daa1142fc6b44e27c8112ec6b4c2d579ddb9bc6b3747504e666010a45a51faa4 AS mariner-core +FROM mcr.microsoft.com/azurelinux/base/core:3.0@sha256:34a22db497ff34a0f35ca5fc54bd38711d04238a2c1b2f65d35dc9d45dd82584 AS mariner-core # mcr.microsoft.com/azurelinux/distroless/base:3.0 -FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:387a603a274e74568fd7a0e6d48ef68e631990e3b5149801515fe749a74b5b29 AS mariner-distroless +FROM mcr.microsoft.com/azurelinux/distroless/base:3.0@sha256:4377af4aa7a810b7d59f691eae5066895a71aa3eee4cfb4eba527bbebff16479 AS mariner-distroless FROM --platform=linux/${ARCH} go AS builder ARG OS diff --git a/hack/aks/deploy.mk b/hack/aks/deploy.mk index e922ef572b0..192a6f1b7e6 100644 --- a/hack/aks/deploy.mk +++ b/hack/aks/deploy.mk @@ -1,7 +1,7 @@ # acnpublic: acnpublic.azurecr.io # general cilium variables DIR ?= 1.18 -CILIUM_VERSION_TAG ?= v1.18.12-260811 +CILIUM_VERSION_TAG ?= v1.18.12-260901 CILIUM_IMAGE_REGISTRY ?= mcr.microsoft.com/containernetworking IPV6_IMAGE_REGISTRY ?= mcr.microsoft.com/containernetworking IPV6_HP_BPF_VERSION ?= v0.0.1 @@ -17,7 +17,7 @@ EBPF_CILIUM_DIR ?= 1.18 EBPF_CILIUM_IMAGE_REGISTRY ?= mcr.microsoft.com/containernetworking IPV6_HP_BPF_VERSION ?= v0.0.1 IPV6_IMAGE_REGISTRY ?= mcr.microsoft.com/containernetworking -EBPF_CILIUM_VERSION_TAG ?= v1.18.12-260811 +EBPF_CILIUM_VERSION_TAG ?= v1.18.12-260901 AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY ?= mcr.microsoft.com/containernetworking AZURE_IPTABLES_MONITOR_TAG ?= v0.0.5-0 AZURE_IPTABLES_MONITOR_IMAGE ?= $(AZURE_IPTABLES_MONITOR_IMAGE_REGISTRY)/azure-iptables-monitor:$(AZURE_IPTABLES_MONITOR_TAG) diff --git a/test/integration/datapath/datapath_linux_test.go b/test/integration/datapath/datapath_linux_test.go index 5ac41ca5244..e0b69115f2e 100644 --- a/test/integration/datapath/datapath_linux_test.go +++ b/test/integration/datapath/datapath_linux_test.go @@ -128,6 +128,12 @@ func setupLinuxEnvironment(t *testing.T) { if err := daemonsetClient.Delete(ctx, daemonset.Name, metav1.DeleteOptions{}); err != nil { t.Log(err) } + + for _, selector := range []string{podLabelSelector, metav1.FormatLabelSelector(daemonset.Spec.Selector)} { + if err := kubernetes.WaitForPodsDelete(ctx, clientset, *podNamespace, selector); err != nil { + t.Error(err) + } + } }) t.Log("Waiting for pods to be running state")