Skip to content

K
k3s
Commit eab0e37a authored by Eric Chiang's avatar Eric Chiang
Browse files
Options

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.
parent 5d270b15
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cmd/kubeadm/app/phases/upgrade/postupgrade_v18_19_test.go
View file @ eab0e37a
...@@ -136,10 +136,6 @@ func TestShouldBackupAPIServerCertAndKey(t *testing.T) { ...@@ -136,10 +136,6 @@ func TestShouldBackupAPIServerCertAndKey(t *testing.T) {
Networking: kubeadmapi.Networking{ServiceSubnet: "10.96.0.0/12", DNSDomain: "cluster.local"}, Networking: kubeadmapi.Networking{ServiceSubnet: "10.96.0.0/12", DNSDomain: "cluster.local"},
NodeName: "test-node", 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 { for desc, test := range map[string]struct {
adjustedExpiry time.Duration adjustedExpiry time.Duration
...@@ -160,6 +156,10 @@ func TestShouldBackupAPIServerCertAndKey(t *testing.T) { ...@@ -160,6 +156,10 @@ func TestShouldBackupAPIServerCertAndKey(t *testing.T) {
expected: true, 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() caCert.NotBefore = caCert.NotBefore.Add(-test.adjustedExpiry).UTC()
apiCert, apiKey, err := certsphase.NewAPIServerCertAndKey(cfg, caCert, caKey) apiCert, apiKey, err := certsphase.NewAPIServerCertAndKey(cfg, caCert, caKey)
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment