Merge pull request #22521 from wojtek-t/support_go_16_in_gofmt

Auto commit by PR queue bot

cmd/libs/go2idl/import-boss/generators/import_restrict.go

@@ -32,8 +32,6 @@ import (
 	"k8s.io/kubernetes/cmd/libs/go2idl/generator"
 	"k8s.io/kubernetes/cmd/libs/go2idl/namer"
 	"k8s.io/kubernetes/cmd/libs/go2idl/types"
-
-	//"github.com/golang/glog"
 )
 
 const (

cmd/libs/go2idl/parser/parse_test.go

@@ -150,13 +150,13 @@ var FooAnotherVar proto.Frobber = proto.AnotherVar
 	rawNamer := namer.NewRawNamer("o", nil)
 	_, u, o := construct(t, testFiles, testNamer)
 	t.Logf("\n%v\n\n", o)
+	args := map[string]interface{}{
+		"Name": testNamer.Name,
+		"Raw":  rawNamer.Name,
+	}
 	tmpl := template.Must(
 		template.New("").
-			Funcs(
+			Funcs(args).
-			map[string]interface{}{
-				"Name": testNamer.Name,
-				"Raw":  rawNamer.Name,
-			}).
 			Parse(tmplText),
 	)
 	buf := &bytes.Buffer{}

pkg/kubelet/config/common_test.go

@@ -26,8 +26,6 @@ import (
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/securitycontext"
-
-	//"github.com/ghodss/yaml"
 )
 
 func noDefault(*api.Pod) error { return nil }