Update to v1.25.0-k3s1 (#6040)

Dockerfile.dapper

-ARG GOLANG=golang:1.18.1-alpine3.15
+ARG GOLANG=golang:1.19.0-alpine3.15
 FROM ${GOLANG}
 
 ARG http_proxy=$http_proxy

pkg/cli/cmds/log_linux.go

@@ -83,7 +83,7 @@ func forkIfLoggingOrReaping() error {
 	return nil
 }
 
-//reapChildren calls Wait4 whenever SIGCHLD is received
+// reapChildren calls Wait4 whenever SIGCHLD is received
 func reapChildren() {
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGCHLD)

pkg/deploy/zz_generated_bindata.go

@@ -401,11 +401,13 @@ var _bindata = map[string]func() (*asset, error){
 // directory embedded in the file by go-bindata.
 // For example if you run go-bindata on data/... and data contains the
 // following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
+//
+//	data/
+//	  foo.txt
+//	  img/
+//	    a.png
+//	    b.png
+//
 // then AssetDir("data") would return []string{"foo.txt", "img"}
 // AssetDir("data/img") would return []string{"a.png", "b.png"}
 // AssetDir("foo.txt") and AssetDir("notexist") would return an error

pkg/generated/clientset/versioned/fake/register.go

@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//   import (
-//     "k8s.io/client-go/kubernetes"
-//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//   )
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
 //
-//   kclientset, _ := kubernetes.NewForConfig(c)
-//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.

pkg/generated/clientset/versioned/scheme/register.go

@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//   import (
-//     "k8s.io/client-go/kubernetes"
-//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//   )
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
 //
-//   kclientset, _ := kubernetes.NewForConfig(c)
-//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.

pkg/static/zz_generated_bindata.go

@@ -181,11 +181,13 @@ var _bindata = map[string]func() (*asset, error){
 // directory embedded in the file by go-bindata.
 // For example if you run go-bindata on data/... and data contains the
 // following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
+//
+//	data/
+//	  foo.txt
+//	  img/
+//	    a.png
+//	    b.png
+//
 // then AssetDir("data") would return []string{"foo.txt", "img"}
 // AssetDir("data/img") would return []string{"a.png", "b.png"}
 // AssetDir("foo.txt") and AssetDir("notexist") would return an error

scripts/binary_size_check.sh

@@ -8,9 +8,9 @@ fi
 
 . ./scripts/version.sh
 
-# Try to keep the K3s binary under 64 megabytes.
+# Try to keep the K3s binary under 70 megabytes.
 # "64M ought to be enough for anybody"
-MAX_BINARY_MB=64
+MAX_BINARY_MB=70
 MAX_BINARY_SIZE=$((MAX_BINARY_MB * 1024 * 1024))
 BIN_SUFFIX="-${ARCH}"
 if [ ${ARCH} = amd64 ]; then

tests/integration/integration.go

@@ -73,9 +73,9 @@ func IsExistingServer() bool {
 // K3sCmd launches the provided K3s command via exec. Command blocks until finished.
 // Command output from both Stderr and Stdout is provided via string. Input can
 // be a single string with space separated args, or multiple string args
-//   cmdEx1, err := K3sCmd("etcd-snapshot", "ls")
-//   cmdEx2, err := K3sCmd("kubectl get pods -A")
-//   cmdEx2, err := K3sCmd("kubectl", "get", "pods", "-A")
+// cmdEx1, err := K3sCmd("etcd-snapshot", "ls")
+// cmdEx2, err := K3sCmd("kubectl get pods -A")
+// cmdEx2, err := K3sCmd("kubectl", "get", "pods", "-A")
 func K3sCmd(inputArgs ...string) (string, error) {
 	if !IsRoot() {
 		return "", errors.New("integration tests must be run as sudo/root")

tests/terraform/testutils.go

@@ -111,7 +111,7 @@ func RunCommand(cmd string) (string, error) {
 	return string(out), err
 }
 
-//Used to count the pods using prefix passed in the list of pods
+// CountOfStringInSlice Used to count the pods using prefix passed in the list of pods
 func CountOfStringInSlice(str string, pods []Pod) int {
 	count := 0
 	for _, pod := range pods {