diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go index 90991fa4bc1..b87e0d74351 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go @@ -30,7 +30,7 @@ import ( "reflect" "strings" - customreflect "k8s.io/kubernetes/third_party/forked/reflect" + customreflect "k8s.io/kubernetes/third_party/forked/golang/reflect" ) func rewriteFile(name string, header []byte, rewriteFn func(*token.FileSet, *ast.File) error) error { diff --git a/pkg/conversion/deep_equal.go b/pkg/conversion/deep_equal.go index 7c3ed7cda13..0e0cb6e0786 100644 --- a/pkg/conversion/deep_equal.go +++ b/pkg/conversion/deep_equal.go @@ -17,7 +17,7 @@ limitations under the License. package conversion import ( - "k8s.io/kubernetes/third_party/forked/reflect" + "k8s.io/kubernetes/third_party/forked/golang/reflect" ) // The code for this type must be located in third_party, since it forks from diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index 91b4645a711..f59f271d603 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" hashutil "k8s.io/kubernetes/pkg/util/hash" - "k8s.io/kubernetes/third_party/forked/expansion" + "k8s.io/kubernetes/third_party/forked/golang/expansion" "github.com/golang/glog" ) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 309ff0b9562..fd4646a497c 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -97,7 +97,7 @@ import ( "k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - "k8s.io/kubernetes/third_party/forked/expansion" + "k8s.io/kubernetes/third_party/forked/golang/expansion" ) const ( diff --git a/pkg/util/httpstream/spdy/roundtripper.go b/pkg/util/httpstream/spdy/roundtripper.go index 49fd43b0945..705964f2a1f 100644 --- a/pkg/util/httpstream/spdy/roundtripper.go +++ b/pkg/util/httpstream/spdy/roundtripper.go @@ -32,7 +32,7 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/util/httpstream" - "k8s.io/kubernetes/third_party/forked/netutil" + "k8s.io/kubernetes/third_party/forked/golang/netutil" ) // SpdyRoundTripper knows how to upgrade an HTTP request to one that supports diff --git a/pkg/util/jsonpath/jsonpath.go b/pkg/util/jsonpath/jsonpath.go index 18a6adb2d42..03ca33db152 100644 --- a/pkg/util/jsonpath/jsonpath.go +++ b/pkg/util/jsonpath/jsonpath.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - "k8s.io/kubernetes/third_party/forked/template" + "k8s.io/kubernetes/third_party/forked/golang/template" ) type JSONPath struct { diff --git a/pkg/util/proxy/dial.go b/pkg/util/proxy/dial.go index d1b5dda4d38..0ddfe15008a 100644 --- a/pkg/util/proxy/dial.go +++ b/pkg/util/proxy/dial.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" utilnet "k8s.io/kubernetes/pkg/util/net" - "k8s.io/kubernetes/third_party/forked/netutil" + "k8s.io/kubernetes/third_party/forked/golang/netutil" ) func DialURL(url *url.URL, transport http.RoundTripper) (net.Conn, error) { diff --git a/pkg/util/strategicpatch/patch.go b/pkg/util/strategicpatch/patch.go index 676713bc86a..f591211bdf7 100644 --- a/pkg/util/strategicpatch/patch.go +++ b/pkg/util/strategicpatch/patch.go @@ -22,7 +22,7 @@ import ( "sort" "k8s.io/kubernetes/pkg/util/json" - forkedjson "k8s.io/kubernetes/third_party/forked/json" + forkedjson "k8s.io/kubernetes/third_party/forked/golang/json" "github.com/davecgh/go-spew/spew" "github.com/ghodss/yaml" diff --git a/third_party/forked/json/LICENSE b/third_party/forked/golang/LICENSE similarity index 100% rename from third_party/forked/json/LICENSE rename to third_party/forked/golang/LICENSE diff --git a/third_party/golang/PATENTS b/third_party/forked/golang/PATENTS similarity index 100% rename from third_party/golang/PATENTS rename to third_party/forked/golang/PATENTS diff --git a/third_party/forked/expansion/expand.go b/third_party/forked/golang/expansion/expand.go similarity index 100% rename from third_party/forked/expansion/expand.go rename to third_party/forked/golang/expansion/expand.go diff --git a/third_party/forked/expansion/expand_test.go b/third_party/forked/golang/expansion/expand_test.go similarity index 100% rename from third_party/forked/expansion/expand_test.go rename to third_party/forked/golang/expansion/expand_test.go diff --git a/third_party/forked/json/fields.go b/third_party/forked/golang/json/fields.go similarity index 100% rename from third_party/forked/json/fields.go rename to third_party/forked/golang/json/fields.go diff --git a/third_party/forked/netutil/addr.go b/third_party/forked/golang/netutil/addr.go similarity index 100% rename from third_party/forked/netutil/addr.go rename to third_party/forked/golang/netutil/addr.go diff --git a/third_party/forked/reflect/deep_equal.go b/third_party/forked/golang/reflect/deep_equal.go similarity index 100% rename from third_party/forked/reflect/deep_equal.go rename to third_party/forked/golang/reflect/deep_equal.go diff --git a/third_party/forked/reflect/deep_equal_test.go b/third_party/forked/golang/reflect/deep_equal_test.go similarity index 100% rename from third_party/forked/reflect/deep_equal_test.go rename to third_party/forked/golang/reflect/deep_equal_test.go diff --git a/third_party/forked/reflect/type.go b/third_party/forked/golang/reflect/type.go similarity index 100% rename from third_party/forked/reflect/type.go rename to third_party/forked/golang/reflect/type.go diff --git a/third_party/forked/template/exec.go b/third_party/forked/golang/template/exec.go similarity index 100% rename from third_party/forked/template/exec.go rename to third_party/forked/golang/template/exec.go diff --git a/third_party/forked/template/funcs.go b/third_party/forked/golang/template/funcs.go similarity index 100% rename from third_party/forked/template/funcs.go rename to third_party/forked/golang/template/funcs.go diff --git a/third_party/forked/reflect/LICENSE b/third_party/forked/reflect/LICENSE deleted file mode 100644 index 74487567632..00000000000 --- a/third_party/forked/reflect/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2012 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/golang/LICENSE b/third_party/golang/LICENSE deleted file mode 100644 index 74487567632..00000000000 --- a/third_party/golang/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2012 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.