From 625a64c9ec68b42f45cb70187e89660560037566 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 21 Sep 2015 13:39:04 -0600 Subject: [PATCH 1/2] Fix documentation in clientcmd/doc.go. --- pkg/client/unversioned/clientcmd/doc.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/client/unversioned/clientcmd/doc.go b/pkg/client/unversioned/clientcmd/doc.go index d8c64d85834..7e8f9b4e3ad 100644 --- a/pkg/client/unversioned/clientcmd/doc.go +++ b/pkg/client/unversioned/clientcmd/doc.go @@ -19,13 +19,19 @@ Package clientcmd provides one stop shopping for building a working client from from a .kubeconfig file, from command line flags, or from any merged combination. Sample usage from merged .kubeconfig files (local directory, home directory) - loadingRules := clientcmd.NewKubeConfigLoadingRules() + + loadingRules := clientcmd.NewDefaultClientConfigLoadingRules() // if you want to change the loading rules (which files in which order), you can do so here configOverrides := &clientcmd.ConfigOverrides{} // if you want to change override values or bind them to flags, there are methods to help you - kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingKubeConfig(loadingRules, configOverrides) - kubeConfig.Client() + kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides) + config, err := kubeConfig.ClientConfig() + if err != nil { + // Do something + } + client, err := unversioned.New(config) + // ... */ package clientcmd From e243ca8129acbe4c915402e08cefb385757cf300 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 21 Sep 2015 13:49:04 -0600 Subject: [PATCH 2/2] Fix package documentation on pkg/client/unversioned. The package documentation seems to reflect an older version of the API. --- pkg/client/unversioned/doc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/client/unversioned/doc.go b/pkg/client/unversioned/doc.go index aa92c1290dd..f9c7f16e712 100644 --- a/pkg/client/unversioned/doc.go +++ b/pkg/client/unversioned/doc.go @@ -15,14 +15,14 @@ limitations under the License. */ /* -Package client contains the implementation of the client side communication with the +Package unversioned contains the implementation of the client side communication with the Kubernetes master. The Client class provides methods for reading, creating, updating, and deleting pods, replication controllers, daemons, services, and nodes. Most consumers should use the Config object to create a Client: import ( - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels"