remove old build tags

spowelljr · spowelljr · commit 1aa1f04e9b4c · 2022-03-30T16:43:29.000-07:00
diff --git a/cmd/drivers/hyperkit/main.go b/cmd/drivers/hyperkit/main.go
@@ -1,5 +1,4 @@
 //go:build darwin && !arm64
-// +build darwin,!arm64
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/cmd/drivers/kvm/main-nolinux.go b/cmd/drivers/kvm/main-nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/cmd/drivers/kvm/main.go b/cmd/drivers/kvm/main.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/hyperkit/driver_test.go b/pkg/drivers/hyperkit/driver_test.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/hyperkit/network.go b/pkg/drivers/hyperkit/network.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/hyperkit/network_test.go b/pkg/drivers/hyperkit/network_test.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/hyperkit/vmnet.go b/pkg/drivers/hyperkit/vmnet.go
@@ -1,5 +1,4 @@
 //go:build darwin && cgo
-// +build darwin,cgo
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/hyperkit/vmnet_stub.go b/pkg/drivers/hyperkit/vmnet_stub.go
@@ -1,5 +1,4 @@
 //go:build darwin && !cgo
-// +build darwin,!cgo
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kic/oci/cgroups_linux.go b/pkg/drivers/kic/oci/cgroups_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kic/oci/cgroups_other.go b/pkg/drivers/kic/oci/cgroups_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/disks.go b/pkg/drivers/kvm/disks.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/domain.go b/pkg/drivers/kvm/domain.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/domain_definition_arm64.go b/pkg/drivers/kvm/domain_definition_arm64.go
@@ -1,5 +1,4 @@
 //go:build linux && arm64
-// +build linux,arm64
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/domain_definition_x86.go b/pkg/drivers/kvm/domain_definition_x86.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/gpu.go b/pkg/drivers/kvm/gpu.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/kvm.go b/pkg/drivers/kvm/kvm.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/network.go b/pkg/drivers/kvm/network.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/constants/constants_darwin.go b/pkg/minikube/constants/constants_darwin.go
@@ -1,5 +1,4 @@
 //go:build (darwin && ignore) || !gendocs
-// +build darwin,ignore !gendocs
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/constants/constants_freebsd.go b/pkg/minikube/constants/constants_freebsd.go
@@ -1,5 +1,4 @@
 //go:build (linux && ignore) || !gendocs
-// +build linux,ignore !gendocs
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/constants/constants_gendocs.go b/pkg/minikube/constants/constants_gendocs.go
@@ -1,5 +1,4 @@
 //go:build gendocs
-// +build gendocs
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/constants/constants_linux.go b/pkg/minikube/constants/constants_linux.go
@@ -1,5 +1,4 @@
 //go:build (linux && ignore) || !gendocs
-// +build linux,ignore !gendocs
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/constants/constants_windows.go b/pkg/minikube/constants/constants_windows.go
@@ -1,5 +1,4 @@
 //go:build (windows && ignore) || !gendocs
-// +build windows,ignore !gendocs
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/perf/logs_test.go b/pkg/minikube/perf/logs_test.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit_test.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit_test.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/hyperv/hyperv.go b/pkg/minikube/registry/drvs/hyperv/hyperv.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
@@ -99,7 +98,7 @@ func status() registry.State {
 		cmd := exec.CommandContext(ctx, path, "-NoProfile", "-NonInteractive", "@(Get-Wmiobject Win32_ComputerSystem).HypervisorPresent")
 		out, err := cmd.CombinedOutput()
 		if err != nil {
-		 	wmiError:= fmt.Errorf("%s failed:\n%s ", strings.Join(cmd.Args, " "), out)
+			wmiError := fmt.Errorf("%s failed:\n%s ", strings.Join(cmd.Args, " "), out)
 			errorMessage := fmt.Errorf("%s\n%s", cimError, wmiError)
 			fixMessage := "Start PowerShell as an Administrator"
 			return registry.State{Installed: false, Running: true, Error: errorMessage, Fix: fixMessage, Doc: docURL}
diff --git a/pkg/minikube/registry/drvs/hyperv/powershell.go b/pkg/minikube/registry/drvs/hyperv/powershell.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/hyperv/vswitch.go b/pkg/minikube/registry/drvs/hyperv/vswitch.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/kvm2/kvm2.go b/pkg/minikube/registry/drvs/kvm2/kvm2.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/none/none.go b/pkg/minikube/registry/drvs/none/none.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/parallels/parallels.go b/pkg/minikube/registry/drvs/parallels/parallels.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go b/pkg/minikube/registry/drvs/vmwarefusion/vmwarefusion.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/schedule/daemonize_unix.go b/pkg/minikube/schedule/daemonize_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/schedule/daemonize_windows.go b/pkg/minikube/schedule/daemonize_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/tunnel/route_darwin_test.go b/pkg/minikube/tunnel/route_darwin_test.go
@@ -1,5 +1,4 @@
 //go:build darwin && integration
-// +build darwin,integration
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/tunnel/route_linux_test.go b/pkg/minikube/tunnel/route_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux && integration
-// +build linux,integration
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/minikube/tunnel/route_windows_test.go b/pkg/minikube/tunnel/route_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows && integration
-// +build windows,integration
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/aab_offline_test.go b/test/integration/aab_offline_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/cert_options_test.go b/test/integration/cert_options_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/docker_test.go b/test/integration/docker_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/error_spam_test.go b/test/integration/error_spam_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/functional_test_mount_test.go b/test/integration/functional_test_mount_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/functional_test_pvc_test.go b/test/integration/functional_test_pvc_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/functional_test_tunnel_test.go b/test/integration/functional_test_tunnel_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/guest_env_test.go b/test/integration/guest_env_test.go
@@ -1,5 +1,4 @@
 //go:build iso
-// +build iso
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/ingress_addon_legacy_test.go b/test/integration/ingress_addon_legacy_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/kic_custom_network_test.go b/test/integration/kic_custom_network_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/mount_start_test.go b/test/integration/mount_start_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/multinode_test.go b/test/integration/multinode_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/net_test.go b/test/integration/net_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/no_kubernetes_test.go b/test/integration/no_kubernetes_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2021 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/none_test.go b/test/integration/none_test.go
@@ -1,5 +1,4 @@
 //go:build integration && linux
-// +build integration,linux
 
 /*
 Copyright 2019 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/pause_test.go b/test/integration/pause_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/preload_test.go b/test/integration/preload_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/scheduled_stop_test.go b/test/integration/scheduled_stop_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/skaffold_test.go b/test/integration/skaffold_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2020 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/test/integration/status_test.go b/test/integration/status_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/third_party/go9p/clnt_stats_http.go b/third_party/go9p/clnt_stats_http.go
@@ -1,5 +1,4 @@
 //go:build httpstats
-// +build httpstats
 
 package go9p
 
diff --git a/third_party/go9p/srv_stats_http.go b/third_party/go9p/srv_stats_http.go
@@ -1,5 +1,4 @@
 //go:build httpstats
-// +build httpstats
 
 package go9p
 
diff --git a/third_party/kubeadm/app/constants/constants_unix.go b/third_party/kubeadm/app/constants/constants_unix.go
diff --git a/third_party/kubeadm/app/constants/constants_windows.go b/third_party/kubeadm/app/constants/constants_windows.go

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build darwin && !arm64`
`2`		`-// +build darwin,!arm64`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2016 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux`
`2`		`-// +build !linux`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2016 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux`
`2`		`-// +build linux`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2016 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build darwin`
`2`		`-// +build darwin`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2016 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build darwin && cgo`
`2`		`-// +build darwin,cgo`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2016 The Kubernetes Authors All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build darwin && !cgo`
`2`		`-// +build darwin,!cgo`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2016 The Kubernetes Authors All rights reserved.`