kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58187 from caesarxuchao/fix-typo 

Automatic merge from submit-queue (batch tested with PRs 57266, 58187, 58186, 46245, 56509). 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>.

[minor] Fix a typo

Fix https://github.com/kubernetes/kubernetes/pull/58025#discussion_r161052726

Kubernetes-commit: 99abe92a5d79ee7e6801f15cf14878ac52e2712f
This commit is contained in:
Kubernetes Publisher 2018-01-12 20:34:48 -08:00
parent 36b5340018 0055602f99
commit 04231f2da5
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Godeps/Godeps.json generated
View File

@ -968,235 +968,235 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "c33db96a31b68b53ce6903caf3ba93571acb0e51"
"Rev": "d40b72863885248607ceac2631cd78de166f51c3"
},
{
"ImportPath": "k8s.io/client-go/discovery",

2
pkg/admission/plugin/webhook/mutating/admission.go
View File

@ -174,7 +174,7 @@ func (a *MutatingWebhook) ValidateInitialization() error {
return fmt.Errorf("MutatingWebhook.convertor is not properly setup: %v", err)
}
if a.defaulter == nil {
return fmt.Errorf("MutatingWebhook.defaulter is not properly setup: %v")
return fmt.Errorf("MutatingWebhook.defaulter is not properly setup")
}
go a.hookSource.Run(wait.NeverStop)
return nil