Get the unversioned client to build

pkg/client/unversioned/auth/clientauth.go

@@ -68,7 +68,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
 // Info holds Kubernetes API authorization config.  It is intended

pkg/client/unversioned/auth/clientauth_test.go

@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	clientauth "k8s.io/kubernetes/pkg/client/auth"
+	clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth"
 )
 
 func TestLoadFromFile(t *testing.T) {

pkg/client/unversioned/cache/listwatch.go

@@ -17,7 +17,7 @@ limitations under the License.
 package cache
 
 import (
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/watch"

pkg/client/unversioned/cache/listwatch_test.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/util"
 )

pkg/client/unversioned/clientcmd/api/latest/latest.go

@@ -17,7 +17,7 @@ limitations under the License.
 package latest
 
 import (
-	"k8s.io/kubernetes/pkg/client/clientcmd/api/v1"
+	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/client/unversioned/clientcmd/api/v1/conversion.go

@@ -19,7 +19,7 @@ package v1
 import (
 	"sort"
 
-	"k8s.io/kubernetes/pkg/client/clientcmd/api"
+	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/runtime"
 )

pkg/client/unversioned/clientcmd/api/v1/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/kubernetes/pkg/client/clientcmd/api"
+	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/client/unversioned/clientcmd/client_config_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api/latest"
-	"k8s.io/kubernetes/pkg/client"
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 )
 
 func createValidTestConfig() *clientcmdapi.Config {

pkg/client/unversioned/clientcmd/loader.go

@@ -28,8 +28,8 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/imdario/mergo"
 
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
-	clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
+	clientcmdlatest "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest"
 	"k8s.io/kubernetes/pkg/util/errors"
 )
 

pkg/client/unversioned/clientcmd/loader_test.go

@@ -28,8 +28,8 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
-	clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
+	clientcmdlatest "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest"
 )
 
 var (

pkg/client/unversioned/clientcmd/merged_client_builder.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/client"
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 )
 
 // DeferredLoadingClientConfig is a ClientConfig interface that is backed by a set of loading rules

pkg/client/unversioned/clientcmd/overrides.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 )
 
 // ConfigOverrides holds values that should override whatever information is pulled from the actual Config object.  You can't

pkg/client/unversioned/clientcmd/validation.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"strings"
 
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/util"
 	utilerrors "k8s.io/kubernetes/pkg/util/errors"
 )

pkg/client/unversioned/clientcmd/validation_test.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/util/errors"
 )
 

pkg/client/unversioned/kubelet_test.go

@@ -129,9 +129,9 @@ func TestNewKubeletClientTLSInvalid(t *testing.T) {
 		EnableHttps: true,
 		//Invalid certificate and key path
 		TLSClientConfig: TLSClientConfig{
-			CertFile: "./testdata/mycertinvalid.cer",
-			KeyFile:  "./testdata/mycertinvalid.key",
-			CAFile:   "./testdata/myCA.cer",
+			CertFile: "../testdata/mycertinvalid.cer",
+			KeyFile:  "../testdata/mycertinvalid.key",
+			CAFile:   "../testdata/myCA.cer",
 		},
 	}
 
@@ -149,11 +149,11 @@ func TestNewKubeletClientTLSValid(t *testing.T) {
 		Port:        9000,
 		EnableHttps: true,
 		TLSClientConfig: TLSClientConfig{
-			CertFile: "./testdata/mycertvalid.cer",
+			CertFile: "../testdata/mycertvalid.cer",
 			// TLS Configuration, only applies if EnableHttps is true.
-			KeyFile: "./testdata/mycertvalid.key",
+			KeyFile: "../testdata/mycertvalid.key",
 			// TLS Configuration, only applies if EnableHttps is true.
-			CAFile: "./testdata/myCA.cer",
+			CAFile: "../testdata/myCA.cer",
 		},
 	}
 

pkg/client/unversioned/portforward/portforward.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/util/httpstream"
 	"k8s.io/kubernetes/pkg/util/httpstream/spdy"
 )

pkg/client/unversioned/portforward/portforward_test.go

@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/util/httpstream"
 )
 

pkg/client/unversioned/record/event.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/watch"

pkg/client/unversioned/record/event_test.go

@@ -25,7 +25,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util"
 )

pkg/client/unversioned/remotecommand/remotecommand.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/conversion/queryparams"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/httpstream"

pkg/client/unversioned/remotecommand/remotecommand_test.go

@@ -27,7 +27,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/util/httpstream"
 	"k8s.io/kubernetes/pkg/util/httpstream/spdy"
 )

pkg/client/unversioned/testclient/fake_test.go

@@ -19,7 +19,7 @@ package testclient
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
 // This test file just ensures that Fake and structs it is embedded in

pkg/client/unversioned/testclient/testclient.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/latest"
 	"k8s.io/kubernetes/pkg/api/registered"
-	"k8s.io/kubernetes/pkg/client"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/version"
 	"k8s.io/kubernetes/pkg/watch"

pkg/client/unversioned/testclient/testclient_test.go

@@ -28,7 +28,7 @@ import (
 
 func TestNewClient(t *testing.T) {
 	o := NewObjects(api.Scheme, api.Scheme)
-	if err := AddObjectsFromPath("../../../examples/guestbook/frontend-service.yaml", o, api.Scheme); err != nil {
+	if err := AddObjectsFromPath("../../../../examples/guestbook/frontend-service.yaml", o, api.Scheme); err != nil {
 		t.Fatal(err)
 	}
 	client := &Fake{ReactFn: ObjectReaction(o, latest.RESTMapper)}