Revert "fix dpdk base tag (#5211)"

This reverts commit 325a42c.

Author: zhangzujian

.trivyignore

@@ -0,0 +1,3 @@
+CVE-2023-2253
+CVE-2024-10220
+CVE-2025-0426

Makefile

@@ -52,7 +52,7 @@ build-kube-ovn: build-go
 	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG) --build-arg VERSION=$(RELEASE_TAG) -f dist/images/Dockerfile dist/images/
 	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-no-avx512 --build-arg BASE_TAG=$(RELEASE_TAG)-no-avx512 -f dist/images/Dockerfile dist/images/
 	docker build -t $(REGISTRY)/kube-ovn:$(DEBUG_TAG) --build-arg BASE_TAG=$(DEBUG_TAG) -f dist/images/Dockerfile dist/images/
-	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk --build-arg VERSION=$(RELEASE_TAG) -f dist/images/Dockerfile.dpdk dist/images/
+	docker build -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk -f dist/images/Dockerfile.dpdk dist/images/
 
 .PHONY: build-dev
 build-dev: build-go
@@ -86,7 +86,7 @@ image-kube-ovn: build-go
 	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG) --build-arg VERSION=$(RELEASE_TAG) -o type=docker -f dist/images/Dockerfile dist/images/
 	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-no-avx512 --build-arg BASE_TAG=$(RELEASE_TAG)-no-avx512 -o type=docker -f dist/images/Dockerfile dist/images/
 	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(DEBUG_TAG) --build-arg BASE_TAG=$(DEBUG_TAG) -o type=docker -f dist/images/Dockerfile dist/images/
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk --build-arg VERSION=$(RELEASE_TAG) -o type=docker -f dist/images/Dockerfile.dpdk dist/images/
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/kube-ovn:$(RELEASE_TAG)-dpdk -o type=docker -f dist/images/Dockerfile.dpdk dist/images/
 
 .PHONY: image-vpc-nat-gateway
 image-vpc-nat-gateway:

dist/images/Dockerfile.base-dpdk

@@ -36,7 +36,7 @@ RUN cd /usr/src/ && \
     git apply $SRC_DIR/22ea22c40b46ee5adeae977ff6cfca81b3ff25d7.patch && \
     git apply $SRC_DIR/a432b1eb496cc1606873068c26716977a02029e2.patch && \
     # compile without avx512
-    if [ "$ARCH" = "amd64" -a "$NO_AVX512" = "true" ]; then git apply $SRC_DIR/f61283c8934589fe6de2b1e86041204dfc31a3e3.patch; fi && \
+    if [ "$ARCH" = "amd64" -a "$NO_AVX512" = "true" ]; then git apply $SRC_DIR/38c59e078d69b343f56ab0f380fb9f42b94b7c02.patch; fi && \
     ./boot.sh && \
     rm -rf .git && \
     export DPDK_DIR=/usr/src/dpdk-stable-20.11.1 && \

dist/images/Dockerfile.dpdk

@@ -1,7 +1,5 @@
 # syntax = docker/dockerfile:experimental
-ARG VERSION
-ARG BASE_TAG=$VERSION
-FROM kubeovn/kube-ovn-base:$BASE_TAG-dpdk
+FROM kubeovn/kube-ovn-base:v1.11.0-dpdk
 
 COPY *.sh /kube-ovn/
 COPY kubectl-ko /kube-ovn/kubectl-ko