github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23443 from goltermann/vet2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-25 23:43:44 -07:00
parent aae121c750 32d569d6c7
commit f6fac0e4de
86 changed files with 177 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/libs/go2idl/client-gen/generators/normalization/normalization.go
View File

@@ -33,5 +33,5 @@ func Version(version string) string {
}
func GroupVersion(gv unversioned.GroupVersion) unversioned.GroupVersion {
return unversioned.GroupVersion{Group(gv.Group), Version(gv.Version)}
return unversioned.GroupVersion{Group: Group(gv.Group), Version: Version(gv.Version)}
}

4
cmd/libs/go2idl/client-gen/main.go
View File

@@ -97,9 +97,9 @@ func main() {
// We may change the output path later.
arguments.OutputPackagePath = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput"
arguments.CustomArgs = clientgenargs.Args{
[]unversioned.GroupVersion{{"testgroup", ""}},
[]unversioned.GroupVersion{{Group: "testgroup", Version: ""}},
map[unversioned.GroupVersion]string{
unversioned.GroupVersion{"testgroup", ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup",
unversioned.GroupVersion{Group: "testgroup", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup",
},
"test_internalclientset",
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/",

2
cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_test.go
View File

@@ -109,7 +109,7 @@ func TestUpdateStatusTestType(t *testing.T) {
"name": "baz",
},
},
Status: testgroup.TestTypeStatus{"I'm in good status"},
Status: testgroup.TestTypeStatus{Blah: "I'm in good status"},
}
c := DecoratedSimpleClient{
simpleClient: simple.Client{