From 6df4f62d1c984003c7e578b4d73fa4c2001b4237 Mon Sep 17 00:00:00 2001 From: tariqibrahim Date: Wed, 14 Aug 2019 21:49:39 -0700 Subject: [PATCH] [kubernetes/kubeadm] fix minor nil issues in kudeadm code --- cmd/kubeadm/app/phases/copycerts/copycerts.go | 2 +- cmd/kubeadm/app/util/pkiutil/pki_helpers.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts.go b/cmd/kubeadm/app/phases/copycerts/copycerts.go index bd1b119ea83..d15033a48de 100644 --- a/cmd/kubeadm/app/phases/copycerts/copycerts.go +++ b/cmd/kubeadm/app/phases/copycerts/copycerts.go @@ -204,7 +204,7 @@ func getDataFromDisk(cfg *kubeadmapi.InitConfiguration, key []byte) (map[string] secretData := map[string][]byte{} for certName, certPath := range certsToTransfer(cfg) { cert, err := loadAndEncryptCert(certPath, key) - if err == nil || (err != nil && os.IsNotExist(err)) { + if err == nil || os.IsNotExist(err) { secretData[certOrKeyNameToSecretName(certName)] = cert } else { return nil, err diff --git a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go index 6e49a924eb1..170c0fa4583 100644 --- a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go +++ b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go @@ -480,8 +480,7 @@ func parseCSRPEM(pemCSR []byte) (*x509.CertificateRequest, error) { } if block.Type != certutil.CertificateRequestBlockType { - var block *pem.Block - return nil, errors.Errorf("expected block type %q, but PEM had type %v", certutil.CertificateRequestBlockType, block.Type) + return nil, errors.Errorf("expected block type %q, but PEM had type %q", certutil.CertificateRequestBlockType, block.Type) } return x509.ParseCertificateRequest(block.Bytes)