Add cilium-dbg cleanup to snap removal hook

canonical · Apr 3, 2024 · e9eb827 · e9eb827
1 parent 5cd57f5
commit e9eb827
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/k8s/lib.sh b/k8s/lib.sh
@@ -69,6 +69,9 @@ k8s::remove::network() {
   do
     tc filter del dev $default_interface ${d} || true
   done
+
+  rm -rf /var/run/cilium/cilium.pid
+  "${SNAP}/usr/bin/cilium-dbg" cleanup --all-state --force
 }
 
 # [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,6 +154,15 @@ 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: