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

refactor: update bazel, codec, and gofmt

Browse Source
This commit is contained in:
Clayton Coleman
2016-12-03 14:06:03 -05:00
parent 5df8cc39c9
commit 3454a8d52c
440 changed files with 8682 additions and 8706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/garbagecollector/garbagecollector.go
View File

@@ -27,8 +27,8 @@ import (
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/meta/metatypes"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/typed/dynamic"
"k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly"

2
pkg/controller/garbagecollector/garbagecollector_test.go
View File

@@ -28,9 +28,9 @@ import (
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/meta/metatypes"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apimachinery/registered"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/typed/dynamic"
"k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly"

2
pkg/controller/garbagecollector/metaonly/metaonly_test.go
View File

@@ -23,8 +23,8 @@ import (
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/meta"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/runtime/serializer"

10
pkg/controller/garbagecollector/metaonly/types.generated.go
View File

@@ -25,8 +25,8 @@ import (
"errors"
"fmt"
codec1978 "github.com/ugorji/go/codec"
pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg3_types "k8s.io/kubernetes/pkg/types"
"reflect"
"runtime"
@@ -63,8 +63,8 @@ func init() {
panic(err)
}
if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_unversioned.TypeMeta
var v1 pkg2_v1.ObjectMeta
var v0 pkg2_v1.ObjectMeta
var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID
var v3 time.Time
_, _, _, _ = v0, v1, v2, v3
@@ -544,7 +544,7 @@ func (x *MetadataOnlyObjectList) codecDecodeSelfFromMap(l int, d *codec1978.Deco
}
case "metadata":
if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{}
x.ListMeta = pkg1_v1.ListMeta{}
} else {
yyv43 := &x.ListMeta
yym44 := z.DecBinary()
@@ -625,7 +625,7 @@ func (x *MetadataOnlyObjectList) codecDecodeSelfFromArray(l int, d *codec1978.De
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{}
x.ListMeta = pkg1_v1.ListMeta{}
} else {
yyv50 := &x.ListMeta
yym51 := z.DecBinary()

2
pkg/controller/garbagecollector/metaonly/types.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package metaonly
import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
)
// MetadataOnlyObject allows decoding only the apiVersion, kind, and metadata fields of