kubeadm: use client-go's MakeCSRFromTemplate() in 'renew'

Create CSR using the mentioned function which also encodes the type CertificateRequestBlockType. Without that 'certs renew' is failing with: 'PEM block type must be CERTIFICATE REQUEST'

kubeadm: use client-go's MakeCSRFromTemplate() in 'renew'
8bc0447d · Lubomir I. Ivanov · 224448b8 · 8bc0447d
Commit 8bc0447d authored Nov 08, 2018 by Lubomir I. Ivanov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

certsapi.go cmd/kubeadm/app/phases/certs/renewal/certsapi.go +1 -2

No files found.
--- a/cmd/kubeadm/app/phases/certs/renewal/certsapi.go
+++ b/cmd/kubeadm/app/phases/certs/renewal/certsapi.go
@@ -17,7 +17,6 @@ limitations under the License.
 package renewal

 import (
-	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
 	"crypto/x509/pkix"
@@ -70,7 +69,7 @@ func (r *CertsAPIRenewal) Renew(cfg *certutil.Config) (*x509.Certificate, *rsa.P
 		return nil, nil, errors.Wrap(err, "couldn't create new private key")
 	}

-	csr, err := x509.CreateCertificateRequest(rand.Reader, reqTmp, key)
+	csr, err := certutil.MakeCSRFromTemplate(key, reqTmp)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "couldn't create certificate signing request")
 	}