diff --git a/cmd/k3s/main_linux.go b/cmd/k3s/main_linux.go index bc427498cae..21247bfb372 100644 --- a/cmd/k3s/main_linux.go +++ b/cmd/k3s/main_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package main diff --git a/cmd/k3s/main_windows.go b/cmd/k3s/main_windows.go index cefca3c91e6..876b13fe467 100644 --- a/cmd/k3s/main_windows.go +++ b/cmd/k3s/main_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package main diff --git a/pkg/agent/config/config_linux.go b/pkg/agent/config/config_linux.go index 34d8216c033..4f4a227dd18 100644 --- a/pkg/agent/config/config_linux.go +++ b/pkg/agent/config/config_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package config diff --git a/pkg/agent/config/config_linux_test.go b/pkg/agent/config/config_linux_test.go index 868304fcb86..bfb0b4048f5 100644 --- a/pkg/agent/config/config_linux_test.go +++ b/pkg/agent/config/config_linux_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package config diff --git a/pkg/agent/config/config_windows.go b/pkg/agent/config/config_windows.go index 03f16f4d654..65a0cf060f1 100644 --- a/pkg/agent/config/config_windows.go +++ b/pkg/agent/config/config_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package config diff --git a/pkg/agent/containerd/config_linux.go b/pkg/agent/containerd/config_linux.go index 0ef89e5e33f..7a34ad7bb3b 100644 --- a/pkg/agent/containerd/config_linux.go +++ b/pkg/agent/containerd/config_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package containerd diff --git a/pkg/agent/containerd/config_windows.go b/pkg/agent/containerd/config_windows.go index 5935de31c10..6e5ebcdf6ac 100644 --- a/pkg/agent/containerd/config_windows.go +++ b/pkg/agent/containerd/config_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package containerd diff --git a/pkg/agent/containerd/runtimes.go b/pkg/agent/containerd/runtimes.go index d0a2be7763a..c378db281a8 100644 --- a/pkg/agent/containerd/runtimes.go +++ b/pkg/agent/containerd/runtimes.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package containerd diff --git a/pkg/agent/containerd/runtimes_test.go b/pkg/agent/containerd/runtimes_test.go index f388b13f71e..8f5310384b4 100644 --- a/pkg/agent/containerd/runtimes_test.go +++ b/pkg/agent/containerd/runtimes_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package containerd diff --git a/pkg/agent/cri/cri_linux.go b/pkg/agent/cri/cri_linux.go index d6e3387d584..8757ac46aca 100644 --- a/pkg/agent/cri/cri_linux.go +++ b/pkg/agent/cri/cri_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package cri diff --git a/pkg/agent/cri/cri_windows.go b/pkg/agent/cri/cri_windows.go index 5eaff1c8a84..0fe294a6353 100644 --- a/pkg/agent/cri/cri_windows.go +++ b/pkg/agent/cri/cri_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package cri diff --git a/pkg/agent/cridockerd/config_linux.go b/pkg/agent/cridockerd/config_linux.go index e50ec3c462a..b49ed87cd9b 100644 --- a/pkg/agent/cridockerd/config_linux.go +++ b/pkg/agent/cridockerd/config_linux.go @@ -1,5 +1,4 @@ //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 index 3630c26eae1..86b146b3fdd 100644 --- a/pkg/agent/cridockerd/config_windows.go +++ b/pkg/agent/cridockerd/config_windows.go @@ -1,5 +1,4 @@ //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 index d528d0c1e8b..46bb9df29da 100644 --- a/pkg/agent/cridockerd/cridockerd.go +++ b/pkg/agent/cridockerd/cridockerd.go @@ -1,5 +1,4 @@ //go:build !no_cri_dockerd -// +build !no_cri_dockerd package cridockerd diff --git a/pkg/agent/cridockerd/nocridockerd.go b/pkg/agent/cridockerd/nocridockerd.go index ba244743e3a..a9cb1b77722 100644 --- a/pkg/agent/cridockerd/nocridockerd.go +++ b/pkg/agent/cridockerd/nocridockerd.go @@ -1,5 +1,4 @@ //go:build no_cri_dockerd -// +build no_cri_dockerd package cridockerd diff --git a/pkg/agent/flannel/setup_linux.go b/pkg/agent/flannel/setup_linux.go index 36404a01c68..6bddf24dd59 100644 --- a/pkg/agent/flannel/setup_linux.go +++ b/pkg/agent/flannel/setup_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package flannel diff --git a/pkg/agent/flannel/setup_windows.go b/pkg/agent/flannel/setup_windows.go index 7b9c513cd36..83106105c74 100644 --- a/pkg/agent/flannel/setup_windows.go +++ b/pkg/agent/flannel/setup_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package flannel diff --git a/pkg/agent/loadbalancer/utility_windows.go b/pkg/agent/loadbalancer/utility_windows.go index 60fe130434e..8e3d18027a6 100644 --- a/pkg/agent/loadbalancer/utility_windows.go +++ b/pkg/agent/loadbalancer/utility_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package loadbalancer diff --git a/pkg/agent/netpol/netpol.go b/pkg/agent/netpol/netpol.go index d057c0cc0df..854e2b0b52f 100644 --- a/pkg/agent/netpol/netpol.go +++ b/pkg/agent/netpol/netpol.go @@ -2,7 +2,6 @@ // - modified from https://github.com/cloudnativelabs/kube-router/blob/73b1b03b32c5755b240f6c077bb097abe3888314/pkg/controllers/netpol.go //go:build !windows -// +build !windows package netpol diff --git a/pkg/agent/run_linux.go b/pkg/agent/run_linux.go index 32aa9dd92c5..5858cecd74c 100644 --- a/pkg/agent/run_linux.go +++ b/pkg/agent/run_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package agent diff --git a/pkg/agent/run_windows.go b/pkg/agent/run_windows.go index e2ff6229839..686b7685723 100644 --- a/pkg/agent/run_windows.go +++ b/pkg/agent/run_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package agent diff --git a/pkg/agent/templates/templates_windows.go b/pkg/agent/templates/templates_windows.go index d3338a983ad..34857968d43 100644 --- a/pkg/agent/templates/templates_windows.go +++ b/pkg/agent/templates/templates_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package templates diff --git a/pkg/cgroups/cgroups_linux.go b/pkg/cgroups/cgroups_linux.go index 5b2f684b658..e2ff531ea1f 100644 --- a/pkg/cgroups/cgroups_linux.go +++ b/pkg/cgroups/cgroups_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package cgroups diff --git a/pkg/cgroups/cgroups_windows.go b/pkg/cgroups/cgroups_windows.go index b38ba9fb6a3..ae24e3ab198 100644 --- a/pkg/cgroups/cgroups_windows.go +++ b/pkg/cgroups/cgroups_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package cgroups diff --git a/pkg/cli/cmds/const_windows.go b/pkg/cli/cmds/const_windows.go index 2d05392cdd4..dffdd63e80c 100644 --- a/pkg/cli/cmds/const_windows.go +++ b/pkg/cli/cmds/const_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package cmds diff --git a/pkg/cli/cmds/init_default.go b/pkg/cli/cmds/init_default.go index 283e18b960e..3e793079d9f 100644 --- a/pkg/cli/cmds/init_default.go +++ b/pkg/cli/cmds/init_default.go @@ -1,5 +1,4 @@ //go:build !linux || !cgo -// +build !linux !cgo package cmds diff --git a/pkg/cli/cmds/log_default.go b/pkg/cli/cmds/log_default.go index bafcda91569..abe58425bc2 100644 --- a/pkg/cli/cmds/log_default.go +++ b/pkg/cli/cmds/log_default.go @@ -1,5 +1,4 @@ //go:build !linux || !cgo -// +build !linux !cgo package cmds diff --git a/pkg/cli/cmds/log_linux.go b/pkg/cli/cmds/log_linux.go index 8a6bcb027b8..4d42e72b392 100644 --- a/pkg/cli/cmds/log_linux.go +++ b/pkg/cli/cmds/log_linux.go @@ -1,5 +1,4 @@ //go:build linux && cgo -// +build linux,cgo package cmds diff --git a/pkg/cli/cmds/nostage.go b/pkg/cli/cmds/nostage.go index bb9f1b9f088..d6899e86f70 100644 --- a/pkg/cli/cmds/nostage.go +++ b/pkg/cli/cmds/nostage.go @@ -1,5 +1,4 @@ //go:build no_stage -// +build no_stage package cmds diff --git a/pkg/clientaccess/token_linux_test.go b/pkg/clientaccess/token_linux_test.go index 9334e89bb16..e4568fdc14e 100644 --- a/pkg/clientaccess/token_linux_test.go +++ b/pkg/clientaccess/token_linux_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package clientaccess diff --git a/pkg/containerd/builtins.go b/pkg/containerd/builtins.go index bbad23a0aa8..24d83f3b448 100644 --- a/pkg/containerd/builtins.go +++ b/pkg/containerd/builtins.go @@ -1,5 +1,4 @@ //go:build ctrd -// +build ctrd /* Copyright The containerd Authors. diff --git a/pkg/containerd/builtins_cri.go b/pkg/containerd/builtins_cri.go index 1bbe3bf74c3..a28e4ba2555 100644 --- a/pkg/containerd/builtins_cri.go +++ b/pkg/containerd/builtins_cri.go @@ -1,5 +1,4 @@ //go:build ctrd -// +build ctrd /* Copyright The containerd Authors. diff --git a/pkg/containerd/builtins_linux.go b/pkg/containerd/builtins_linux.go index ff31fa41e1d..c238899a884 100644 --- a/pkg/containerd/builtins_linux.go +++ b/pkg/containerd/builtins_linux.go @@ -1,5 +1,4 @@ //go:build ctrd -// +build ctrd /* Copyright The containerd Authors. diff --git a/pkg/containerd/builtins_windows.go b/pkg/containerd/builtins_windows.go index 401993f216a..c2a2947f375 100644 --- a/pkg/containerd/builtins_windows.go +++ b/pkg/containerd/builtins_windows.go @@ -1,5 +1,4 @@ //go:build ctrd -// +build ctrd /* Copyright The containerd Authors. diff --git a/pkg/containerd/main.go b/pkg/containerd/main.go index eff2e865c73..762ec98ee4d 100644 --- a/pkg/containerd/main.go +++ b/pkg/containerd/main.go @@ -1,5 +1,4 @@ //go:build ctrd -// +build ctrd package containerd diff --git a/pkg/containerd/utility_windows.go b/pkg/containerd/utility_windows.go index ecb741b98fa..3c26e2295a0 100644 --- a/pkg/containerd/utility_windows.go +++ b/pkg/containerd/utility_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package containerd diff --git a/pkg/daemons/agent/agent_linux.go b/pkg/daemons/agent/agent_linux.go index 560ae28ca88..0c6dadc7560 100644 --- a/pkg/daemons/agent/agent_linux.go +++ b/pkg/daemons/agent/agent_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package agent diff --git a/pkg/daemons/agent/agent_windows.go b/pkg/daemons/agent/agent_windows.go index ec0f0d9f571..ff2fa4856ca 100644 --- a/pkg/daemons/agent/agent_windows.go +++ b/pkg/daemons/agent/agent_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package agent diff --git a/pkg/deploy/nostage.go b/pkg/deploy/nostage.go index 553d624c77f..6542040b4bd 100644 --- a/pkg/deploy/nostage.go +++ b/pkg/deploy/nostage.go @@ -1,5 +1,4 @@ //go:build no_stage -// +build no_stage package deploy diff --git a/pkg/deploy/stage.go b/pkg/deploy/stage.go index c7b458ccb9a..937190a7ca9 100644 --- a/pkg/deploy/stage.go +++ b/pkg/deploy/stage.go @@ -1,5 +1,4 @@ //go:build !no_stage -// +build !no_stage package deploy diff --git a/pkg/etcd/etcd_linux_test.go b/pkg/etcd/etcd_linux_test.go index cea07e4c733..661d4d7750e 100644 --- a/pkg/etcd/etcd_linux_test.go +++ b/pkg/etcd/etcd_linux_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package etcd diff --git a/pkg/executor/embed/embed.go b/pkg/executor/embed/embed.go index df655754186..0e26fcc71e5 100644 --- a/pkg/executor/embed/embed.go +++ b/pkg/executor/embed/embed.go @@ -1,5 +1,4 @@ //go:build !no_embedded_executor -// +build !no_embedded_executor package embed diff --git a/pkg/executor/embed/embed_linux.go b/pkg/executor/embed/embed_linux.go index a41449e32a1..4deeb1133ef 100644 --- a/pkg/executor/embed/embed_linux.go +++ b/pkg/executor/embed/embed_linux.go @@ -1,5 +1,4 @@ //go:build linux && !no_embedded_executor -// +build linux,!no_embedded_executor package embed diff --git a/pkg/executor/embed/embed_windows.go b/pkg/executor/embed/embed_windows.go index cdd5e09d323..30a8ec72d0c 100644 --- a/pkg/executor/embed/embed_windows.go +++ b/pkg/executor/embed/embed_windows.go @@ -1,5 +1,4 @@ //go:build windows && !no_embedded_executor -// +build windows,!no_embedded_executor package embed diff --git a/pkg/flock/flock_other.go b/pkg/flock/flock_other.go index dfb7d03a6e3..ac2af4a15f9 100644 --- a/pkg/flock/flock_other.go +++ b/pkg/flock/flock_other.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin && !freebsd && !openbsd && !netbsd && !dragonfly -// +build !linux,!darwin,!freebsd,!openbsd,!netbsd,!dragonfly /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/proctitle/proctile.go b/pkg/proctitle/proctile.go index 178dfa9ef06..43cec6e232c 100644 --- a/pkg/proctitle/proctile.go +++ b/pkg/proctitle/proctile.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package proctitle diff --git a/pkg/proctitle/proctile_windows.go b/pkg/proctitle/proctile_windows.go index 9ade88241c7..f34722c2877 100644 --- a/pkg/proctitle/proctile_windows.go +++ b/pkg/proctitle/proctile_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package proctitle diff --git a/pkg/rootless/mounts.go b/pkg/rootless/mounts.go index 3dfcd6ed91a..d17d1263efb 100644 --- a/pkg/rootless/mounts.go +++ b/pkg/rootless/mounts.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package rootless diff --git a/pkg/rootless/portdriver.go b/pkg/rootless/portdriver.go index 9736ad878c4..5c4d95b5f7e 100644 --- a/pkg/rootless/portdriver.go +++ b/pkg/rootless/portdriver.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package rootless diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go index e4abb37c413..a1931b5327f 100644 --- a/pkg/rootless/rootless.go +++ b/pkg/rootless/rootless.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package rootless diff --git a/pkg/rootlessports/controller.go b/pkg/rootlessports/controller.go index f779f32069e..82c8d9563c4 100644 --- a/pkg/rootlessports/controller.go +++ b/pkg/rootlessports/controller.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package rootlessports diff --git a/pkg/signals/signals_posix.go b/pkg/signals/signals_posix.go index 489dfc0423a..33cfbd23309 100644 --- a/pkg/signals/signals_posix.go +++ b/pkg/signals/signals_posix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package signals diff --git a/pkg/signals/signals_windows.go b/pkg/signals/signals_windows.go index 027dc49d60b..29ab33f0c5d 100644 --- a/pkg/signals/signals_windows.go +++ b/pkg/signals/signals_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package signals diff --git a/pkg/static/nostage.go b/pkg/static/nostage.go index f3fc6049012..7c086e34d39 100644 --- a/pkg/static/nostage.go +++ b/pkg/static/nostage.go @@ -1,5 +1,4 @@ //go:build no_stage -// +build no_stage package static diff --git a/pkg/static/stage.go b/pkg/static/stage.go index 7f083639080..303c4f6c7e3 100644 --- a/pkg/static/stage.go +++ b/pkg/static/stage.go @@ -1,5 +1,4 @@ //go:build !no_stage -// +build !no_stage package static diff --git a/pkg/util/net_unix.go b/pkg/util/net_unix.go index 521e577cd15..cf3b35cb914 100644 --- a/pkg/util/net_unix.go +++ b/pkg/util/net_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/net_windows.go b/pkg/util/net_windows.go index bb895c095a7..281cf6a3f4c 100644 --- a/pkg/util/net_windows.go +++ b/pkg/util/net_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package util diff --git a/pkg/util/permissions/permissions_others.go b/pkg/util/permissions/permissions_others.go index 3d43c323244..e2d1ab1d4cb 100644 --- a/pkg/util/permissions/permissions_others.go +++ b/pkg/util/permissions/permissions_others.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package permissions diff --git a/pkg/util/permissions/permissions_windows.go b/pkg/util/permissions/permissions_windows.go index df0e6988139..03df43aba7d 100644 --- a/pkg/util/permissions/permissions_windows.go +++ b/pkg/util/permissions/permissions_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package permissions