mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

fix merge conflict

Browse source
This commit is contained in:
shivdudhani 2019-05-16 11:38:02 -07:00
parent e938866e06
commit 951a092147
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init.go
View file

@ -32,7 +32,7 @@ func initTlsPemPair(certFile, keyFile string, clientConfig *rest.Config, client
if tlsPair != nil { if tlsPair != nil {
return tlsPair, nil return tlsPair, nil
} }
tlsPair, err = tlsPairFromCluster(clientConfig, kubeclient) tlsPair, err = tlsPairFromCluster(clientConfig, client)
return tlsPair, err return tlsPair, err
} }
@ -64,7 +64,7 @@ func tlsPairFromFiles(certFile, keyFile string) *tls.TlsPemPair {
// Created pair is stored in cluster's secret. // Created pair is stored in cluster's secret.
// Returns struct with key/certificate pair. // Returns struct with key/certificate pair.
func tlsPairFromCluster(configuration *rest.Config, client *client.Client) (*tls.TlsPemPair, error) { 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 { if err != nil {
return nil, err return nil, err
} }