Revert "Merge branch 'dev/k8s-deviceid-model' into master"

This reverts commit 194c27fadf, reversing
changes made to 96d4d79d1f.
This commit is contained in:
Tomofumi Hayashi
2018-08-30 20:15:30 +09:00
parent 194c27fadf
commit 517f2d4b7a
604 changed files with 6879 additions and 21568 deletions

39
vendor/k8s.io/api/rbac/v1beta1/BUILD generated vendored
View File

@@ -1,39 +0,0 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = [
"doc.go",
"generated.pb.go",
"register.go",
"types.go",
"types_swagger_doc_generated.go",
"zz_generated.deepcopy.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/api/rbac/v1beta1",
importpath = "k8s.io/api/rbac/v1beta1",
deps = [
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

View File

@@ -62,8 +62,12 @@ func (in *ClusterRole) DeepCopyInto(out *ClusterRole) {
}
if in.AggregationRule != nil {
in, out := &in.AggregationRule, &out.AggregationRule
*out = new(AggregationRule)
(*in).DeepCopyInto(*out)
if *in == nil {
*out = nil
} else {
*out = new(AggregationRule)
(*in).DeepCopyInto(*out)
}
}
return
}