Merge pull request #1444 from KnicKnic/k3s_build_windows

pkg/agent/containerd/command.go

+// +build !windows
+
+package containerd
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+func addDeathSig(cmd *exec.Cmd) {
+	// not supported in this OS
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Pdeathsig: syscall.SIGKILL,
+	}
+}

pkg/agent/containerd/command_windows.go

+package containerd
+
+import "os/exec"
+
+func addDeathSig(_ *exec.Cmd) {
+	// not supported in this OS
+}

pkg/agent/containerd/containerd.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"syscall"
 	"time"
 
 	"github.com/containerd/containerd"
@@ -67,9 +66,7 @@ func Run(ctx context.Context, cfg *config.Node) error {
 		cmd := exec.Command(args[0], args[1:]...)
 		cmd.Stdout = stdOut
 		cmd.Stderr = stdErr
-		cmd.SysProcAttr = &syscall.SysProcAttr{
-			Pdeathsig: syscall.SIGKILL,
-		}
+		addDeathSig(cmd)
 		if err := cmd.Run(); err != nil {
 			fmt.Fprintf(os.Stderr, "containerd: %s\n", err)
 		}

pkg/agent/netpol/netpol_windows.go

+package netpol
+
+import (
+	"context"
+	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+)
+
+func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error {
+	panic("Netpol is not supported on windows ensure to pass --disable-network-policy")
+}

pkg/agent/netpol/network_policy.go

+// +build !windows
+
 package netpol
 
 import (

pkg/agent/netpol/network_policy_controller.go

 // Apache License v2.0 (copyright Cloud Native Labs & Rancher Labs)
 // - modified from https://github.com/cloudnativelabs/kube-router/blob/d6f9f31a7b/pkg/controllers/netpol/network_policy_controller.go
 
+// +build !windows
+
 package netpol
 
 import (

pkg/agent/netpol/utils.go

 // Apache License v2.0 (copyright Cloud Native Labs & Rancher Labs)
 // - modified from https://github.com/cloudnativelabs/kube-router/tree/d6f9f31a7b/pkg/utils
 
+// +build !windows
+
 package netpol
 
 import (

pkg/agent/syssetup/setup.go

+// +build !windows
+
 package syssetup
 
 import (

pkg/agent/syssetup/setup_windows.go

+package syssetup
+
+func Configure() {}

pkg/passwd/passwd.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/rancher/k3s/pkg/token"
+	"github.com/rancher/k3s/pkg/util"
 )
 
 type entry struct {
@@ -141,7 +142,7 @@ func writePasswords(passwdFile string, records [][]string) error {
 		}
 		defer out.Close()
 
-		if err := out.Chmod(0600); err != nil {
+		if err := util.SetFileModeForFile(out, 0600); err != nil {
 			return err
 		}
 

pkg/rootless/mounts.go

+// +build !windows
+
 package rootless
 
 import (

pkg/rootless/rootless.go

+// +build !windows
+
 package rootless
 
 import (

pkg/rootless/rootless_windows.go

+package rootless
+
+func Rootless(stateDir string) error {
+	panic("Rootless not supported on windows")
+}

pkg/rootlessports/controller.go

+// +build !windows
+
 package rootlessports
 
 import (

pkg/rootlessports/controller_windows.go

+package rootlessports
+
+import (
+	"context"
+	coreClients "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1"
+)
+
+func Register(ctx context.Context, serviceController coreClients.ServiceController, httpsPort int) error {
+	panic("Rootless is not supported on windows")
+}

pkg/server/server.go

@@ -24,6 +24,7 @@ import (
 	"github.com/rancher/k3s/pkg/rootlessports"
 	"github.com/rancher/k3s/pkg/servicelb"
 	"github.com/rancher/k3s/pkg/static"
+	"github.com/rancher/k3s/pkg/util"
 	v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1"
 	"github.com/rancher/wrangler/pkg/leader"
 	"github.com/rancher/wrangler/pkg/resolvehome"
@@ -263,12 +264,12 @@ func writeKubeConfig(certs string, config *Config) error {
 	if config.ControlConfig.KubeConfigMode != "" {
 		mode, err := strconv.ParseInt(config.ControlConfig.KubeConfigMode, 8, 0)
 		if err == nil {
-			os.Chmod(kubeConfig, os.FileMode(mode))
+			util.SetFileModeForPath(kubeConfig, os.FileMode(mode))
 		} else {
 			logrus.Errorf("failed to set %s to mode %s: %v", kubeConfig, os.FileMode(mode), err)
 		}
 	} else {
-		os.Chmod(kubeConfig, os.FileMode(0600))
+		util.SetFileModeForPath(kubeConfig, os.FileMode(0600))
 	}
 
 	if kubeConfigSymlink != kubeConfig {

pkg/util/file.go

+// +build !windows
+
+package util
+
+import (
+	"os"
+)
+
+func SetFileModeForPath(name string, mode os.FileMode) error {
+	return os.Chmod(name, mode)
+}
+
+func SetFileModeForFile(file *os.File, mode os.FileMode) error {
+	return file.Chmod(mode)
+}

pkg/util/file_windows.go

+package util
+
+import (
+	"os"
+)
+
+func SetFileModeForPath(name string, mode os.FileMode) error {
+	return nil
+}
+
+func SetFileModeForFile(file *os.File, mode os.FileMode) error {
+	return nil
+}