Merge pull request #4287 from twz123/remove-duplicate-build-tag

twz123 · web-flow · commit 3f3746335c04 · 2024-04-19T18:30:41.000+02:00
Remove implicit build tag
diff --git a/pkg/apis/k0s/v1beta1/cplb_linux.go b/pkg/apis/k0s/v1beta1/cplb_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 /*
 Copyright 2024 k0s authors
 
diff --git a/pkg/apis/k0s/v1beta1/cplb_other.go b/pkg/apis/k0s/v1beta1/cplb_other.go
@@ -19,9 +19,10 @@ limitations under the License.
 package v1beta1
 
 import (
-	"errors"
+	"fmt"
+	"runtime"
 )
 
 func getDefaultNIC() (string, error) {
-	return "", errors.New("getDefaultNIC on Windows is not supported")
+	return "", fmt.Errorf("getDefaultNIC on %s is not supported", runtime.GOOS)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ limitations under the License.`
`19`	`19`	`package v1beta1`
`20`	`20`
`21`	`21`	`import (`
`22`		`- "errors"`
	`22`	`+ "fmt"`
	`23`	`+ "runtime"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`func getDefaultNIC() (string, error) {`
`26`		`- return "", errors.New("getDefaultNIC on Windows is not supported")`
	`27`	`+ return "", fmt.Errorf("getDefaultNIC on %s is not supported", runtime.GOOS)`
`27`	`28`	`}`