Merge pull request #71115 from xichengliudui/fix181116

update notes

Kubernetes-commit: 2a9fbe64902fd0c1e447faf2cbc4eb0f2f407363
This commit is contained in:
Kubernetes Publisher 2018-12-31 21:18:34 -08:00
commit 2c52a580e8
2 changed files with 53 additions and 53 deletions

104
Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"GoVersion": "go1.11", "GoVersion": "go1.11",
"GodepVersion": "v80", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
], ],
@ -408,207 +408,207 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "9c4c366543346abeca2a5cd2c40cf1a30d19a2ec" "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",

View File

@ -22,7 +22,7 @@ import (
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// ExecCredentials is used by exec-based plugins to communicate credentials to // ExecCredential is used by exec-based plugins to communicate credentials to
// HTTP transports. // HTTP transports.
type ExecCredential struct { type ExecCredential struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`