metalbear-co#2014 Support k0s (metalbear-co#2015)

* add containerd.sock path for k0s * Add changelog
Razz4780 · Oct 20, 2023 · fafcca4 · fafcca4
1 parent 4b77b34
commit fafcca4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/2014.added.md b/changelog.d/2014.added.md
@@ -0,0 +1 @@
+Added k0s support - add k0s containerd socket path.
diff --git a/mirrord/agent/src/runtime.rs b/mirrord/agent/src/runtime.rs
@@ -28,13 +28,15 @@ const CONTAINERD_DEFAULT_SOCK_PATH: &str = "/host/run/containerd/containerd.sock
 const CONTAINERD_ALTERNATIVE_SOCK_PATH: &str = "/host/run/dockershim.sock";
 const CONTAINERD_K3S_SOCK_PATH: &str = "/host/run/k3s/containerd/containerd.sock";
 const CONTAINERD_MICROK8S_SOCK_PATH: &str = "/host/var/snap/microk8s/common/run/containerd.sock";
+const CONTAINERD_K0S_SOCK_PATH: &str = "/host/run/k0s/containerd.sock";
 
 /// Possible containerd socket paths, evaluated from left to right.
-const CONTAINERD_SOCK_PATHS: [&str; 4] = [
+const CONTAINERD_SOCK_PATHS: [&str; 5] = [
     CONTAINERD_DEFAULT_SOCK_PATH,
     CONTAINERD_ALTERNATIVE_SOCK_PATH,
     CONTAINERD_K3S_SOCK_PATH,
     CONTAINERD_MICROK8S_SOCK_PATH,
+    CONTAINERD_K0S_SOCK_PATH,
 ];
 
 const DEFAULT_CONTAINERD_NAMESPACE: &str = "k8s.io";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Added k0s support - add k0s containerd socket path.