From 2a17dbff130cdad7543d24b4cac7d87a606cced5 Mon Sep 17 00:00:00 2001
From: Kris Rousey <krousey@google.com>
Date: Wed, 12 Aug 2015 12:41:32 -0700
Subject: [PATCH] Moving clientauth package to be under client

---
 cmd/kubelet/app/server.go                          | 2 +-
 contrib/mesos/pkg/scheduler/service/service.go     | 2 +-
 pkg/{clientauth => client/auth}/clientauth.go      | 8 ++++----
 pkg/{clientauth => client/auth}/clientauth_test.go | 4 ++--
 pkg/client/clientcmd/auth_loaders.go               | 2 +-
 pkg/client/clientcmd/client_config.go              | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename pkg/{clientauth => client/auth}/clientauth.go (95%)
 rename pkg/{clientauth => client/auth}/clientauth_test.go (96%)

diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
index 4ea2010a2d1..1cb96730199 100644
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -35,11 +35,11 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/client"
+	clientauth "k8s.io/kubernetes/pkg/client/auth"
 	"k8s.io/kubernetes/pkg/client/chaosclient"
 	"k8s.io/kubernetes/pkg/client/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
 	"k8s.io/kubernetes/pkg/client/record"
-	"k8s.io/kubernetes/pkg/clientauth"
 	"k8s.io/kubernetes/pkg/credentialprovider"
 	"k8s.io/kubernetes/pkg/healthz"
 	"k8s.io/kubernetes/pkg/kubelet"
diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go
index e61542cdb1d..417b141ff65 100644
--- a/contrib/mesos/pkg/scheduler/service/service.go
+++ b/contrib/mesos/pkg/scheduler/service/service.go
@@ -62,7 +62,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/client"
-	"k8s.io/kubernetes/pkg/clientauth"
+	clientauth "k8s.io/kubernetes/pkg/client/auth"
 	"k8s.io/kubernetes/pkg/master/ports"
 	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
 	"k8s.io/kubernetes/pkg/tools"
diff --git a/pkg/clientauth/clientauth.go b/pkg/client/auth/clientauth.go
similarity index 95%
rename from pkg/clientauth/clientauth.go
rename to pkg/client/auth/clientauth.go
index 7fb683f661a..bae5e43007d 100644
--- a/pkg/clientauth/clientauth.go
+++ b/pkg/client/auth/clientauth.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 /*
-Package authcfg defines a file format for holding authentication
+Package auth defines a file format for holding authentication
 information needed by clients of Kubernetes.  Typically,
 a Kubernetes cluster will put auth info for the admin in a known
 location when it is created, and will (soon) put it in a known
@@ -47,10 +47,10 @@ Example:
 
     import (
         "pkg/client"
-        "pkg/clientauth"
+        "pkg/client/auth"
     )
 
-    info, err := clientauth.LoadFromFile(filename)
+    info, err := auth.LoadFromFile(filename)
     if err != nil {
       // handle error
     }
@@ -60,7 +60,7 @@ Example:
     client := client.New(clientConfig)
     client.Pods(ns).List()
 */
-package clientauth
+package auth
 
 // TODO: need a way to rotate Tokens.  Therefore, need a way for client object to be reset when the authcfg is updated.
 import (
diff --git a/pkg/clientauth/clientauth_test.go b/pkg/client/auth/clientauth_test.go
similarity index 96%
rename from pkg/clientauth/clientauth_test.go
rename to pkg/client/auth/clientauth_test.go
index d0047e81bdf..9dd492559f3 100644
--- a/pkg/clientauth/clientauth_test.go
+++ b/pkg/client/auth/clientauth_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clientauth_test
+package auth_test
 
 import (
 	"io/ioutil"
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/kubernetes/pkg/clientauth"
+	clientauth "k8s.io/kubernetes/pkg/client/auth"
 )
 
 func TestLoadFromFile(t *testing.T) {
diff --git a/pkg/client/clientcmd/auth_loaders.go b/pkg/client/clientcmd/auth_loaders.go
index 407dbe007fc..56967b145cb 100644
--- a/pkg/client/clientcmd/auth_loaders.go
+++ b/pkg/client/clientcmd/auth_loaders.go
@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"k8s.io/kubernetes/pkg/clientauth"
+	clientauth "k8s.io/kubernetes/pkg/client/auth"
 )
 
 // AuthLoaders are used to build clientauth.Info objects.
diff --git a/pkg/client/clientcmd/client_config.go b/pkg/client/clientcmd/client_config.go
index c95486d0ba8..b2fc4d1b91b 100644
--- a/pkg/client/clientcmd/client_config.go
+++ b/pkg/client/clientcmd/client_config.go
@@ -26,8 +26,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client"
+	clientauth "k8s.io/kubernetes/pkg/client/auth"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api"
-	"k8s.io/kubernetes/pkg/clientauth"
 )
 
 var (