From ad60069d716b4e51e1a7a1174fafe658fe9f8102 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 26 Nov 2017 23:35:58 -0500 Subject: [PATCH] SSH keys - be lazier about keystore creation --- cmd/kops/create_cluster.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go index 99f0043346..929871d582 100644 --- a/cmd/kops/create_cluster.go +++ b/cmd/kops/create_cluster.go @@ -1054,20 +1054,22 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e return fmt.Errorf("error writing updated configuration: %v", err) } - keyStore, err := clientset.KeyStore(cluster) - if err != nil { - return err - } - err = registry.WriteConfigDeprecated(cluster, configBase.Join(registry.PathClusterCompleted), fullCluster) if err != nil { return fmt.Errorf("error writing completed cluster spec: %v", err) } - for k, data := range sshPublicKeys { - err = keyStore.AddSSHPublicKey(k, data) + if len(sshPublicKeys) != 0 { + keyStore, err := clientset.KeyStore(cluster) if err != nil { - return fmt.Errorf("error adding SSH public key: %v", err) + return err + } + + for k, data := range sshPublicKeys { + err = keyStore.AddSSHPublicKey(k, data) + if err != nil { + return fmt.Errorf("error adding SSH public key: %v", err) + } } }