diff --git a/pkg/client/unversioned/auth/clientauth.go b/pkg/client/unversioned/auth/clientauth.go index bae5e43007d..16acc00ce7c 100644 --- a/pkg/client/unversioned/auth/clientauth.go +++ b/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 diff --git a/pkg/client/unversioned/auth/clientauth_test.go b/pkg/client/unversioned/auth/clientauth_test.go index 9dd492559f3..a99c5d94a03 100644 --- a/pkg/client/unversioned/auth/clientauth_test.go +++ b/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) { diff --git a/pkg/client/unversioned/cache/listwatch.go b/pkg/client/unversioned/cache/listwatch.go index dbc1dc5bcab..1383565dbc0 100644 --- a/pkg/client/unversioned/cache/listwatch.go +++ b/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" diff --git a/pkg/client/unversioned/cache/listwatch_test.go b/pkg/client/unversioned/cache/listwatch_test.go index 019faa6e8a6..3d2e4f1ef8d 100644 --- a/pkg/client/unversioned/cache/listwatch_test.go +++ b/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" ) diff --git a/pkg/client/unversioned/clientcmd/api/latest/latest.go b/pkg/client/unversioned/clientcmd/api/latest/latest.go index 7da9d6e3e26..d1272295676 100644 --- a/pkg/client/unversioned/clientcmd/api/latest/latest.go +++ b/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" ) diff --git a/pkg/client/unversioned/clientcmd/api/v1/conversion.go b/pkg/client/unversioned/clientcmd/api/v1/conversion.go index ab6eb6accfb..cffdeb6ea9e 100644 --- a/pkg/client/unversioned/clientcmd/api/v1/conversion.go +++ b/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" ) diff --git a/pkg/client/unversioned/clientcmd/api/v1/register.go b/pkg/client/unversioned/clientcmd/api/v1/register.go index f8d1f5c3f64..c2cfeaf6c88 100644 --- a/pkg/client/unversioned/clientcmd/api/v1/register.go +++ b/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" ) diff --git a/pkg/client/unversioned/clientcmd/client_config_test.go b/pkg/client/unversioned/clientcmd/client_config_test.go index 33113023c4f..4bf6eebd696 100644 --- a/pkg/client/unversioned/clientcmd/client_config_test.go +++ b/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 { diff --git a/pkg/client/unversioned/clientcmd/loader.go b/pkg/client/unversioned/clientcmd/loader.go index 09c1fed05bc..09c9ae7a8e6 100644 --- a/pkg/client/unversioned/clientcmd/loader.go +++ b/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" ) diff --git a/pkg/client/unversioned/clientcmd/loader_test.go b/pkg/client/unversioned/clientcmd/loader_test.go index 3334953aacd..8e0c7a4f142 100644 --- a/pkg/client/unversioned/clientcmd/loader_test.go +++ b/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 ( diff --git a/pkg/client/unversioned/clientcmd/merged_client_builder.go b/pkg/client/unversioned/clientcmd/merged_client_builder.go index 38df2deff03..42c8d1df551 100644 --- a/pkg/client/unversioned/clientcmd/merged_client_builder.go +++ b/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 diff --git a/pkg/client/unversioned/clientcmd/overrides.go b/pkg/client/unversioned/clientcmd/overrides.go index 14d64ef6668..8a6d6bf141c 100644 --- a/pkg/client/unversioned/clientcmd/overrides.go +++ b/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 diff --git a/pkg/client/unversioned/clientcmd/validation.go b/pkg/client/unversioned/clientcmd/validation.go index 40a5d1dde64..002f135d10d 100644 --- a/pkg/client/unversioned/clientcmd/validation.go +++ b/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" ) diff --git a/pkg/client/unversioned/clientcmd/validation_test.go b/pkg/client/unversioned/clientcmd/validation_test.go index c5c5df41100..4b6c2a9cb89 100644 --- a/pkg/client/unversioned/clientcmd/validation_test.go +++ b/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" ) diff --git a/pkg/client/unversioned/kubelet_test.go b/pkg/client/unversioned/kubelet_test.go index 933a5c69de6..f4d2456ae1a 100644 --- a/pkg/client/unversioned/kubelet_test.go +++ b/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", }, } diff --git a/pkg/client/unversioned/portforward/portforward.go b/pkg/client/unversioned/portforward/portforward.go index a7dfe159613..085e35db2b9 100644 --- a/pkg/client/unversioned/portforward/portforward.go +++ b/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" ) diff --git a/pkg/client/unversioned/portforward/portforward_test.go b/pkg/client/unversioned/portforward/portforward_test.go index f8c60923968..cce3049ab02 100644 --- a/pkg/client/unversioned/portforward/portforward_test.go +++ b/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" ) diff --git a/pkg/client/unversioned/record/event.go b/pkg/client/unversioned/record/event.go index a5e71324a86..4058e632038 100644 --- a/pkg/client/unversioned/record/event.go +++ b/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" diff --git a/pkg/client/unversioned/record/event_test.go b/pkg/client/unversioned/record/event_test.go index 0885ef9e7b5..90bb082496e 100644 --- a/pkg/client/unversioned/record/event_test.go +++ b/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" ) diff --git a/pkg/client/unversioned/remotecommand/remotecommand.go b/pkg/client/unversioned/remotecommand/remotecommand.go index 91b83bde8be..277532e6767 100644 --- a/pkg/client/unversioned/remotecommand/remotecommand.go +++ b/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" diff --git a/pkg/client/unversioned/remotecommand/remotecommand_test.go b/pkg/client/unversioned/remotecommand/remotecommand_test.go index 90f091e144c..a07a27a29a2 100644 --- a/pkg/client/unversioned/remotecommand/remotecommand_test.go +++ b/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" ) diff --git a/pkg/client/unversioned/testclient/fake_test.go b/pkg/client/unversioned/testclient/fake_test.go index 753a9431d52..303d6d786b7 100644 --- a/pkg/client/unversioned/testclient/fake_test.go +++ b/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 diff --git a/pkg/client/unversioned/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go index 5301168d622..f7eb8a1f1f2 100644 --- a/pkg/client/unversioned/testclient/testclient.go +++ b/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" diff --git a/pkg/client/unversioned/testclient/testclient_test.go b/pkg/client/unversioned/testclient/testclient_test.go index 54b949d8800..f814437a221 100644 --- a/pkg/client/unversioned/testclient/testclient_test.go +++ b/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)}