k3s containerd (#13)

deepfence · Feb 1, 2022 · b4c91d0 · b4c91d0
1 parent 6a5223a
commit b4c91d0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/autodetect.go b/autodetect.go
@@ -205,7 +205,7 @@ func NewRuntime() (Runtime, error) {
 
 	if runtime == constants.DOCKER {
 		return docker.New(), nil
-	} else if runtime == constants.CONTAINERD {
+	} else if runtime == constants.CONTAINERD || runtime == constants.K3S_CONTAINERD {
 		return self_containerd.New(), nil
 	}
 

diff --git a/constants/constants.go b/constants/constants.go
@@ -3,18 +3,22 @@ package constants
 import "time"
 
 const (
-	UnixProtocol              = "unix"
-	Timeout                   = 10 * time.Second
-	CONTAINERD_K8S_NS         = "k8s.io"
-	CONTAINERD                = "containerd"
-	DOCKER                    = "docker"
-	CONTAINERD_SOCKET_ADDRESS = "/run/containerd/containerd.sock"
-	DOCKER_SOCKET_ADDRESS     = "/var/run/docker.sock"
-	CONTAINERD_SOCKET_IRI     = "unix://" + CONTAINERD_SOCKET_ADDRESS
-	DOCKER_SOCKET_IRI         = "unix://" + DOCKER_SOCKET_ADDRESS
+	UnixProtocol                  = "unix"
+	Timeout                       = 10 * time.Second
+	CONTAINERD_K8S_NS             = "k8s.io"
+	CONTAINERD                    = "containerd"
+	K3S_CONTAINERD                = "k3s_containerd"
+	DOCKER                        = "docker"
+	CONTAINERD_SOCKET_ADDRESS     = "/run/containerd/containerd.sock"
+	K3S_CONTAINERD_SOCKET_ADDRESS = "/run/k3s/containerd/containerd.sock"
+	DOCKER_SOCKET_ADDRESS         = "/var/run/docker.sock"
+	CONTAINERD_SOCKET_IRI         = "unix://" + CONTAINERD_SOCKET_ADDRESS
+	DOCKER_SOCKET_IRI             = "unix://" + DOCKER_SOCKET_ADDRESS
+	K3S_CONTAINERD_SOCKET_IRI     = "unix://" + K3S_CONTAINERD_SOCKET_ADDRESS
 )
 
 var SupportedRuntimes = map[string]string{
-	DOCKER:     DOCKER_SOCKET_IRI,
-	CONTAINERD: CONTAINERD_SOCKET_IRI,
+	DOCKER:         DOCKER_SOCKET_IRI,
+	CONTAINERD:     CONTAINERD_SOCKET_IRI,
+	K3S_CONTAINERD: K3S_CONTAINERD_SOCKET_IRI,
 }