Add cilium-dbg cleanup to snap removal hook (#286)

canonical · Apr 5, 2024 · 95d8dbe · 95d8dbe
1 parent b1d992e
commit 95d8dbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/k8s/lib.sh b/k8s/lib.sh
@@ -69,6 +69,11 @@ k8s::remove::network() {
   do
     tc filter del dev $default_interface ${d} || true
   done
+
+  rm -rf /var/run/cilium/cilium.pid
+  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/src/k8s/pkg/component/images.go b/src/k8s/pkg/component/images.go
@@ -4,10 +4,10 @@ const dnsImageRepository = "ghcr.io/canonical/coredns"
 const dnsImageTag = "1.11.1-ck1"
 
 const ciliumAgentImageRepository = "ghcr.io/canonical/cilium"
-const ciliumAgentImageTag = "1.15.2-ck0"
+const ciliumAgentImageTag = "1.15.2-ck1"
 
 const ciliumOperatorImageRepository = "ghcr.io/canonical/cilium-operator"
-const ciliumOperatorImageTag = "1.15.2-ck0"
+const ciliumOperatorImageTag = "1.15.2-ck1"
 
 const storageImageRepository = "ghcr.io/canonical/rawfile-localpv"
 const storageImageTag = "0.8.0-ck5"