diff --git a/k8s/lib.sh b/k8s/lib.sh index 69ae7e959..22c4b0cfa 100755 --- a/k8s/lib.sh +++ b/k8s/lib.sh @@ -71,7 +71,9 @@ k8s::remove::network() { done rm -rf /var/run/cilium/cilium.pid - "${SNAP}/usr/bin/cilium-dbg" cleanup --all-state --force + if [ -f /opt/cni/bin/cilium-dbg ]; then + /opt/cni/bin/cilium-dbg cleanup --all-state --force || true + fi } # [DANGER] Cleanup containers and runtime state. Note that the order of operations below is crucial. diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 40c183bcc..196a7ae88 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -154,15 +154,6 @@ parts: source: build-scripts override-build: ./build-component.sh runc - cilium-dbg: - after: [build-deps] - plugin: make - source-type: git - source: https://github.com/cilium/cilium.git - source-tag: v1.15.2 - source-depth: 1 - source-subdir: cilium-dbg - bash-utils: plugin: nil stage-packages: