From eab0e37a63cde770c5ff000c3a8bfd536ca45e0f Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Mon, 18 Dec 2017 15:35:31 -0800 Subject: [PATCH] kubeadm upgrade: fix unit test The CA generated for each test case is global and the cases modify the expiry. This can flake depending on what order the tests run. Generate a new CA for each test case. --- cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19_test.go index d45e744f415..6720202f64b 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19_test.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19_test.go @@ -136,10 +136,6 @@ func TestShouldBackupAPIServerCertAndKey(t *testing.T) { Networking: kubeadmapi.Networking{ServiceSubnet: "10.96.0.0/12", DNSDomain: "cluster.local"}, NodeName: "test-node", } - caCert, caKey, err := certsphase.NewCACertAndKey() - if err != nil { - t.Fatalf("failed creation of ca cert and key: %v", err) - } for desc, test := range map[string]struct { adjustedExpiry time.Duration @@ -160,6 +156,10 @@ func TestShouldBackupAPIServerCertAndKey(t *testing.T) { expected: true, }, } { + caCert, caKey, err := certsphase.NewCACertAndKey() + if err != nil { + t.Fatalf("failed creation of ca cert and key: %v", err) + } caCert.NotBefore = caCert.NotBefore.Add(-test.adjustedExpiry).UTC() apiCert, apiKey, err := certsphase.NewAPIServerCertAndKey(cfg, caCert, caKey) if err != nil {