Merge pull request kubernetes#28204 from thockin/cleanup-third_party

Automatic merge from submit-queue Cleanup third party (pt 2) Move forked-and-hacked golang code to the forked/ directory. Remove ast/build/parse code that is now in stdlib. Remove unused shell2junit
lavalamp · Jul 7, 2016 · 4da14c8 · 4da14c8
2 parents 8601530 + 8c42c08
commit 4da14c8
Show file tree

Hide file tree

Showing 191 changed files with 19 additions and 45,391 deletions.
diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/package.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/package.go
@@ -18,14 +18,13 @@ package protobuf
 
 import (
 	"fmt"
+	"go/ast"
 	"log"
 	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
 
-	"k8s.io/kubernetes/third_party/golang/go/ast"
-
 	"k8s.io/kubernetes/cmd/libs/go2idl/generator"
 	"k8s.io/kubernetes/cmd/libs/go2idl/types"
 )

diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go
@@ -20,17 +20,17 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"go/ast"
 	"go/format"
+	"go/parser"
+	"go/printer"
+	"go/token"
 	"io/ioutil"
 	"os"
 	"reflect"
 	"strings"
 
-	"k8s.io/kubernetes/third_party/golang/go/ast"
-	"k8s.io/kubernetes/third_party/golang/go/parser"
-	"k8s.io/kubernetes/third_party/golang/go/printer"
-	"k8s.io/kubernetes/third_party/golang/go/token"
-	customreflect "k8s.io/kubernetes/third_party/golang/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/cmd/libs/go2idl/parser/parse.go b/cmd/libs/go2idl/parser/parse.go
@@ -18,20 +18,19 @@ package parser
 
 import (
 	"fmt"
+	"go/ast"
+	"go/build"
+	"go/parser"
+	"go/token"
+	tc "go/types"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 
-	"k8s.io/kubernetes/cmd/libs/go2idl/types"
-	"k8s.io/kubernetes/third_party/golang/go/ast"
-	"k8s.io/kubernetes/third_party/golang/go/build"
-	"k8s.io/kubernetes/third_party/golang/go/parser"
-	"k8s.io/kubernetes/third_party/golang/go/token"
-	tc "k8s.io/kubernetes/third_party/golang/go/types"
-
 	"github.com/golang/glog"
+	"k8s.io/kubernetes/cmd/libs/go2idl/types"
 )
 
 // Builder lets you add all the go files in all the packages that you care

diff --git 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
@@ -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/golang/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
@@ -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/golang/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
@@ -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/golang/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
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"strings"
 
-	"k8s.io/kubernetes/third_party/golang/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
@@ -26,7 +26,7 @@ import (
 	"github.com/golang/glog"
 
 	utilnet "k8s.io/kubernetes/pkg/util/net"
-	"k8s.io/kubernetes/third_party/golang/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
@@ -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 → third_party/forked/golang/LICENSE b/third_party/forked/json/LICENSE → third_party/forked/golang/LICENSE
diff --git a/third_party/golang/PATENTS → third_party/forked/golang/PATENTS b/third_party/golang/PATENTS → third_party/forked/golang/PATENTS
diff --git a/third_party/golang/expansion/expand.go → ...d_party/forked/golang/expansion/expand.go b/third_party/golang/expansion/expand.go → ...d_party/forked/golang/expansion/expand.go
diff --git a/third_party/golang/expansion/expand_test.go → ...ty/forked/golang/expansion/expand_test.go b/third_party/golang/expansion/expand_test.go → ...ty/forked/golang/expansion/expand_test.go
diff --git a/third_party/forked/json/fields.go → third_party/forked/golang/json/fields.go b/third_party/forked/json/fields.go → third_party/forked/golang/json/fields.go
diff --git a/third_party/golang/netutil/addr.go → third_party/forked/golang/netutil/addr.go b/third_party/golang/netutil/addr.go → third_party/forked/golang/netutil/addr.go
diff --git a/third_party/forked/reflect/deep_equal.go → ...party/forked/golang/reflect/deep_equal.go b/third_party/forked/reflect/deep_equal.go → ...party/forked/golang/reflect/deep_equal.go
diff --git a/...d_party/forked/reflect/deep_equal_test.go → .../forked/golang/reflect/deep_equal_test.go b/...d_party/forked/reflect/deep_equal_test.go → .../forked/golang/reflect/deep_equal_test.go
diff --git a/third_party/golang/reflect/type.go → third_party/forked/golang/reflect/type.go b/third_party/golang/reflect/type.go → third_party/forked/golang/reflect/type.go
diff --git a/third_party/golang/template/exec.go → third_party/forked/golang/template/exec.go b/third_party/golang/template/exec.go → third_party/forked/golang/template/exec.go
diff --git a/third_party/golang/template/funcs.go → third_party/forked/golang/template/funcs.go b/third_party/golang/template/funcs.go → third_party/forked/golang/template/funcs.go
diff --git a/third_party/forked/reflect/LICENSE b/third_party/forked/reflect/LICENSE
diff --git a/third_party/golang/LICENSE b/third_party/golang/LICENSE
diff --git a/third_party/golang/go/README.md b/third_party/golang/go/README.md