mirror of
https://github.com/kubernetes/sample-controller.git
synced 2026-04-12 00:00:26 +08:00
Merge pull request #62412 from bhcleek/go1.10
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. generated code should pass go vet for go1.10 **What this PR does / why we need it**: Update code generator and the code it generates to pass `go vet`. go1.10 runs `go vet` whenever `go test` is run. Because of this, generated code for CRDs needs to pass `go vet`. **Release note**: ```release-note Code generated for CRDs now passes `go vet`. ``` Kubernetes-commit: 5dde701b876d1d0915314c3ed146e986c4327f7e
This commit is contained in:
+11
-11
@@ -45,12 +45,12 @@ func TestGVPackageFlag(t *testing.T) {
|
||||
args: []string{"foo/bar/v1", "foo/bar/v2", "foo/bar/", "foo/v1"},
|
||||
expectedGroups: []types.GroupVersions{
|
||||
{PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{
|
||||
{"v1", "foo/bar/v1"},
|
||||
{"v2", "foo/bar/v2"},
|
||||
{"", "foo/bar"},
|
||||
{Version: "v1", Package: "foo/bar/v1"},
|
||||
{Version: "v2", Package: "foo/bar/v2"},
|
||||
{Version: "", Package: "foo/bar"},
|
||||
}},
|
||||
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
|
||||
{"v1", "foo/v1"},
|
||||
{Version: "v1", Package: "foo/v1"},
|
||||
}},
|
||||
},
|
||||
},
|
||||
@@ -59,12 +59,12 @@ func TestGVPackageFlag(t *testing.T) {
|
||||
def: []string{"foo/bar/v1alpha1", "foo/v1"},
|
||||
expectedGroups: []types.GroupVersions{
|
||||
{PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{
|
||||
{"v1", "foo/bar/v1"},
|
||||
{"v2", "foo/bar/v2"},
|
||||
{"", "foo/bar"},
|
||||
{Version: "v1", Package: "foo/bar/v1"},
|
||||
{Version: "v2", Package: "foo/bar/v2"},
|
||||
{Version: "", Package: "foo/bar"},
|
||||
}},
|
||||
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
|
||||
{"v1", "foo/v1"},
|
||||
{Version: "v1", Package: "foo/v1"},
|
||||
}},
|
||||
},
|
||||
},
|
||||
@@ -72,8 +72,8 @@ func TestGVPackageFlag(t *testing.T) {
|
||||
args: []string{"api/v1", "api"},
|
||||
expectedGroups: []types.GroupVersions{
|
||||
{PackageName: "core", Group: types.Group("api"), Versions: []types.PackageVersion{
|
||||
{"v1", "core/v1"},
|
||||
{"", "core"},
|
||||
{Version: "v1", Package: "core/v1"},
|
||||
{Version: "", Package: "core"},
|
||||
}},
|
||||
},
|
||||
},
|
||||
@@ -82,7 +82,7 @@ func TestGVPackageFlag(t *testing.T) {
|
||||
importBasePath: "k8s.io/api",
|
||||
expectedGroups: []types.GroupVersions{
|
||||
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
|
||||
{"v1", "k8s.io/api/foo/v1"},
|
||||
{Version: "v1", Package: "k8s.io/api/foo/v1"},
|
||||
}},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user