Try to use binary installed by cilium rock

canonical · Apr 3, 2024 · 6fe5824 · 6fe5824
1 parent e9eb827
commit 6fe5824
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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: