mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #22521 from wojtek-t/support_go_16_in_gofmt
Auto commit by PR queue bot
This commit is contained in:
commit
dba955e112
@ -32,8 +32,6 @@ import (
|
|||||||
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
|
"k8s.io/kubernetes/cmd/libs/go2idl/generator"
|
||||||
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
|
"k8s.io/kubernetes/cmd/libs/go2idl/namer"
|
||||||
"k8s.io/kubernetes/cmd/libs/go2idl/types"
|
"k8s.io/kubernetes/cmd/libs/go2idl/types"
|
||||||
|
|
||||||
//"github.com/golang/glog"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -150,13 +150,13 @@ var FooAnotherVar proto.Frobber = proto.AnotherVar
|
|||||||
rawNamer := namer.NewRawNamer("o", nil)
|
rawNamer := namer.NewRawNamer("o", nil)
|
||||||
_, u, o := construct(t, testFiles, testNamer)
|
_, u, o := construct(t, testFiles, testNamer)
|
||||||
t.Logf("\n%v\n\n", o)
|
t.Logf("\n%v\n\n", o)
|
||||||
|
args := map[string]interface{}{
|
||||||
|
"Name": testNamer.Name,
|
||||||
|
"Raw": rawNamer.Name,
|
||||||
|
}
|
||||||
tmpl := template.Must(
|
tmpl := template.Must(
|
||||||
template.New("").
|
template.New("").
|
||||||
Funcs(
|
Funcs(args).
|
||||||
map[string]interface{}{
|
|
||||||
"Name": testNamer.Name,
|
|
||||||
"Raw": rawNamer.Name,
|
|
||||||
}).
|
|
||||||
Parse(tmplText),
|
Parse(tmplText),
|
||||||
)
|
)
|
||||||
buf := &bytes.Buffer{}
|
buf := &bytes.Buffer{}
|
||||||
|
@ -26,8 +26,6 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/apimachinery/registered"
|
"k8s.io/kubernetes/pkg/apimachinery/registered"
|
||||||
"k8s.io/kubernetes/pkg/runtime"
|
"k8s.io/kubernetes/pkg/runtime"
|
||||||
"k8s.io/kubernetes/pkg/securitycontext"
|
"k8s.io/kubernetes/pkg/securitycontext"
|
||||||
|
|
||||||
//"github.com/ghodss/yaml"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func noDefault(*api.Pod) error { return nil }
|
func noDefault(*api.Pod) error { return nil }
|
||||||
|
Loading…
Reference in New Issue
Block a user