From a80a57307407e4ce8c14db00514ebc711abce6f4 Mon Sep 17 00:00:00 2001 From: Yago Nobre Date: Sat, 3 Nov 2018 03:31:30 -0300 Subject: [PATCH] Fix error wrap on pki_helpers --- cmd/kubeadm/app/util/pkiutil/pki_helpers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go index c6dd0bff8bd..7872ccb72ac 100644 --- a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go +++ b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go @@ -201,7 +201,7 @@ func TryLoadKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, error) { case *rsa.PrivateKey: key = k default: - return nil, errors.Wrapf(err, "the private key file %s isn't in RSA format", privateKeyPath) + return nil, errors.Errorf("the private key file %s isn't in RSA format", privateKeyPath) } return key, nil @@ -228,7 +228,7 @@ func TryLoadPrivatePublicKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, *rs // Allow RSA format only k, ok := privKey.(*rsa.PrivateKey) if !ok { - return nil, nil, errors.Wrapf(err, "the private key file %s isn't in RSA format", privateKeyPath) + return nil, nil, errors.Errorf("the private key file %s isn't in RSA format", privateKeyPath) } p := pubKeys[0].(*rsa.PublicKey)