094b80ae16
When CNI ADD never completes, multus DEL fails because delegate plugins require runtime state that only exists after a successful ADD. This creates a deadlock where containerd cannot release sandbox name reservations, permanently blocking pod creation on the affected node. Build a custom multus-cni image with a patch that returns success on DEL when no cache file exists (ADD was never completed). Upstream PR: https://github.com/k8snetworkplumbingwg/multus-cni/pull/1498 Tracking issue: https://github.com/cozystack/cozystack/issues/2310 Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
25 lines
1.2 KiB
Makefile
25 lines
1.2 KiB
Makefile
export NAME=multus
|
|
export NAMESPACE=cozy-$(NAME)
|
|
|
|
include ../../../hack/common-envs.mk
|
|
include ../../../hack/package.mk
|
|
|
|
update:
|
|
rm -rf templates
|
|
mkdir templates
|
|
$(eval RELEASE := $(shell curl -s https://api.github.com/repos/k8snetworkplumbingwg/multus-cni/releases/latest?per_page=1 | jq -r '.name'))
|
|
wget -q https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/refs/tags/$(RELEASE)/deployments/multus-daemonset-thick.yml -O templates/multus-daemonset-thick.yml
|
|
sed -i '/multus-cni/s/snapshot-thick/$(RELEASE)-thick/' templates/multus-daemonset-thick.yml && \
|
|
patch --no-backup-if-mismatch -p4 < patches/customize-deployment.patch
|
|
$(SED_INPLACE) "/ARG VERSION/ s|=.*|=$(RELEASE)|g" images/multus-cni/Dockerfile
|
|
|
|
image:
|
|
docker buildx build images/multus-cni \
|
|
--tag $(REGISTRY)/multus-cni:$(call settag,$(TAG)) \
|
|
--cache-from type=registry,ref=$(REGISTRY)/multus-cni:latest \
|
|
--cache-to type=inline \
|
|
--metadata-file images/multus-cni.json \
|
|
$(BUILDX_ARGS)
|
|
DIGEST=$$(yq e '."containerimage.digest"' images/multus-cni.json -o json -r) && \
|
|
sed -i "s|image: .*multus-cni.*|image: $(REGISTRY)/multus-cni:$(TAG)@$${DIGEST}|g" templates/multus-daemonset-thick.yml
|
|
rm -f images/multus-cni.json
|