Preserve old keys/certs in Keypair.Render()

kubernetes · May 4, 2021 · c24e359 · c24e359
1 parent 1cc7831
commit c24e359
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/upup/pkg/fi/fitasks/keypair.go b/upup/pkg/fi/fitasks/keypair.go
@@ -180,7 +180,9 @@ func (_ *Keypair) Render(c *fi.Context, a, e, changes *Keypair) error {
 			return err
 		}
 		if keyset == nil {
-			keyset = &fi.Keyset{}
+			keyset = &fi.Keyset{
+				Items: map[string]*fi.KeysetItem{},
+			}
 		}
 
 		// We always reuse the private key if it exists,
@@ -232,13 +234,9 @@ func (_ *Keypair) Render(c *fi.Context, a, e, changes *Keypair) error {
 			PrivateKey:  privateKey,
 		}
 
-		keyset = &fi.Keyset{
-			LegacyFormat: false,
-			Items: map[string]*fi.KeysetItem{
-				serialString: ki,
-			},
-			Primary: ki,
-		}
+		keyset.LegacyFormat = false
+		keyset.Items[ki.Id] = ki
+		keyset.Primary = ki
 		err = c.Keystore.StoreKeyset(name, keyset)
 		if err != nil {
 			return err