From f5e9eb86742ef4350fdb7e5f3c3827593f06937d Mon Sep 17 00:00:00 2001 From: liz Date: Thu, 9 Aug 2018 15:14:05 -0400 Subject: [PATCH] Add certlist.go - a declarative list of all certs kubeadm requires * Sub out New*CertAndKey for functions using the new certlist --- cmd/kubeadm/app/phases/certs/certs_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/cmd/kubeadm/app/phases/certs/certs_test.go b/cmd/kubeadm/app/phases/certs/certs_test.go index 446f0ab35fe..08122d18707 100644 --- a/cmd/kubeadm/app/phases/certs/certs_test.go +++ b/cmd/kubeadm/app/phases/certs/certs_test.go @@ -17,7 +17,9 @@ limitations under the License. package certs import ( + "crypto" "crypto/rsa" + "crypto/tls" "crypto/x509" "fmt" "net" @@ -803,3 +805,17 @@ func TestCreateCertificateFilesMethods(t *testing.T) { testutil.AssertFileExists(t, tmpdir, test.expectedFiles...) } } + +func parseCertAndKey(basePath string, t *testing.T) (*x509.Certificate, crypto.PrivateKey) { + certPair, err := tls.LoadX509KeyPair(basePath+".crt", basePath+".key") + if err != nil { + t.Fatalf("couldn't parse certificate and key: %v", err) + } + + parsedCert, err := x509.ParseCertificate(certPair.Certificate[0]) + if err != nil { + t.Fatalf("couldn't parse certificate: %v", err) + } + + return parsedCert, certPair.PrivateKey +}