diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 270b5315c..8be15924a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -352,7 +352,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "f4e7d7f24368" + "Rev": "89d410bde4ec" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 95b580a9f..db2bf16c2 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 google.golang.org/appengine v1.5.0 // indirect k8s.io/api v0.0.0-20191115142644-28bee1a9beb0 - k8s.io/apimachinery v0.0.0-20191115142644-f4e7d7f24368 + k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d sigs.k8s.io/yaml v1.1.0 @@ -39,5 +39,5 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 k8s.io/api => k8s.io/api v0.0.0-20191115142644-28bee1a9beb0 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191115142644-f4e7d7f24368 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec ) diff --git a/go.sum b/go.sum index ed3bf6a36..6c10e17aa 100644 --- a/go.sum +++ b/go.sum @@ -192,7 +192,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.0.0-20191115142644-28bee1a9beb0/go.mod h1:ZVjGUHSaVjiY2VSFKQpOMtCCSufZWU73UPNKtAURCBQ= -k8s.io/apimachinery v0.0.0-20191115142644-f4e7d7f24368/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA= +k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/util/cert/server_inspection.go b/util/cert/server_inspection.go index 0fef88114..f1ef292de 100644 --- a/util/cert/server_inspection.go +++ b/util/cert/server_inspection.go @@ -19,6 +19,7 @@ package cert import ( "crypto/tls" "crypto/x509" + "fmt" "net/url" "strings" ) @@ -43,7 +44,9 @@ func GetClientCANames(apiHost string) ([]string, error) { if err != nil { return nil, err } - defer conn.Close() + if err := conn.Close(); err != nil { + return nil, err + } return acceptableCAs, nil } @@ -72,7 +75,9 @@ func GetServingCertificates(apiHost, serverName string) ([]*x509.Certificate, [] if err != nil { return nil, nil, err } - conn.Close() + if err = conn.Close(); err != nil { + return nil, nil, fmt.Errorf("failed to close connection : %v", err) + } peerCerts := conn.ConnectionState().PeerCertificates peerCertBytes := [][]byte{}