From 951a0921475648f20a654ae575f555e2430ba34d Mon Sep 17 00:00:00 2001 From: shivdudhani Date: Thu, 16 May 2019 11:38:02 -0700 Subject: [PATCH] fix merge conflict --- init.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.go b/init.go index 60e86e1421..b6553dc3c3 100644 --- a/init.go +++ b/init.go @@ -32,7 +32,7 @@ func initTlsPemPair(certFile, keyFile string, clientConfig *rest.Config, client if tlsPair != nil { return tlsPair, nil } - tlsPair, err = tlsPairFromCluster(clientConfig, kubeclient) + tlsPair, err = tlsPairFromCluster(clientConfig, client) return tlsPair, err } @@ -64,7 +64,7 @@ func tlsPairFromFiles(certFile, keyFile string) *tls.TlsPemPair { // Created pair is stored in cluster's secret. // Returns struct with key/certificate pair. func tlsPairFromCluster(configuration *rest.Config, client *client.Client) (*tls.TlsPemPair, error) { - apiServerUrl, err := url.Parse(configuration.Host) + apiServerURL, err := url.Parse(configuration.Host) if err != nil { return nil, err }