Add build tag to disable cri-dockerd

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
k3s-io · Jan 26, 2023 · 89f7062 · 89f7062
1 parent f10af36
commit 89f7062
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/pkg/agent/cridockerd/config_linux.go b/pkg/agent/cridockerd/config_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build linux && !no_cri_dockerd
+// +build linux,!no_cri_dockerd
 
 package cridockerd
 

diff --git a/pkg/agent/cridockerd/config_windows.go b/pkg/agent/cridockerd/config_windows.go
@@ -1,5 +1,5 @@
-//go:build windows
-// +build windows
+//go:build windows && !no_cri_dockerd
+// +build windows,!no_cri_dockerd
 
 package cridockerd
 

diff --git a/pkg/agent/cridockerd/cridockerd.go b/pkg/agent/cridockerd/cridockerd.go
@@ -1,3 +1,6 @@
+//go:build !no_cri_dockerd
+// +build !no_cri_dockerd
+
 package cridockerd
 
 import (

diff --git a/pkg/agent/cridockerd/nocridockerd.go b/pkg/agent/cridockerd/nocridockerd.go
@@ -0,0 +1,15 @@
+//go:build no_cri_dockerd
+// +build no_cri_dockerd
+
+package cridockerd
+
+import (
+	"context"
+	"errors"
+
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+)
+
+func Run(ctx context.Context, cfg *config.Node) error {
+	return errors.New("cri-dockerd disabled at build time")
+}