kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3933 from justinsb/lazy_ssh_keystore 

Automatic merge from submit-queue.

SSH keys - be lazier about keystore creation
This commit is contained in:
Kubernetes Submit Queue 2017-12-03 20:40:42 -08:00 committed by GitHub
parent 2b7b0f6cc7 ad60069d71
commit bfd747a873
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/kops/create_cluster.go
View File

@ -1054,20 +1054,22 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
return fmt.Errorf("error writing updated configuration: %v", err) 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) err = registry.WriteConfigDeprecated(cluster, configBase.Join(registry.PathClusterCompleted), fullCluster)
if err != nil { if err != nil {
return fmt.Errorf("error writing completed cluster spec: %v", err) return fmt.Errorf("error writing completed cluster spec: %v", err)
} }
for k, data := range sshPublicKeys { if len(sshPublicKeys) != 0 {
err = keyStore.AddSSHPublicKey(k, data) keyStore, err := clientset.KeyStore(cluster)
if err != nil { 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)
}
} }
} }