From 01807c1fac15560836fcaf615c75b102fffed930 Mon Sep 17 00:00:00 2001 From: Muhammed Uluyol Date: Mon, 10 Aug 2015 13:05:57 -0700 Subject: [PATCH] Make ClientCache public --- pkg/kubectl/cmd/util/clientcache.go | 12 ++++++------ pkg/kubectl/cmd/util/factory.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/kubectl/cmd/util/clientcache.go b/pkg/kubectl/cmd/util/clientcache.go index 2d6f2c4abf0..30598163a6c 100644 --- a/pkg/kubectl/cmd/util/clientcache.go +++ b/pkg/kubectl/cmd/util/clientcache.go @@ -22,17 +22,17 @@ import ( "k8s.io/kubernetes/pkg/client/clientcmd" ) -func NewClientCache(loader clientcmd.ClientConfig) *clientCache { - return &clientCache{ +func NewClientCache(loader clientcmd.ClientConfig) *ClientCache { + return &ClientCache{ clients: make(map[string]*client.Client), configs: make(map[string]*client.Config), loader: loader, } } -// clientCache caches previously loaded clients for reuse, and ensures MatchServerVersion +// ClientCache caches previously loaded clients for reuse, and ensures MatchServerVersion // is invoked only once -type clientCache struct { +type ClientCache struct { loader clientcmd.ClientConfig clients map[string]*client.Client configs map[string]*client.Config @@ -42,7 +42,7 @@ type clientCache struct { } // ClientConfigForVersion returns the correct config for a server -func (c *clientCache) ClientConfigForVersion(version string) (*client.Config, error) { +func (c *ClientCache) ClientConfigForVersion(version string) (*client.Config, error) { if c.defaultConfig == nil { config, err := c.loader.ClientConfig() if err != nil { @@ -73,7 +73,7 @@ func (c *clientCache) ClientConfigForVersion(version string) (*client.Config, er // ClientForVersion initializes or reuses a client for the specified version, or returns an // error if that is not possible -func (c *clientCache) ClientForVersion(version string) (*client.Client, error) { +func (c *ClientCache) ClientForVersion(version string) (*client.Client, error) { if client, ok := c.clients[version]; ok { return client, nil } diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index d68fb57f49a..9299c9b65dc 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -49,7 +49,7 @@ const ( // TODO: pass the various interfaces on the factory directly into the command constructors (so the // commands are decoupled from the factory). type Factory struct { - clients *clientCache + clients *ClientCache flags *pflag.FlagSet generators map[string]kubectl.Generator