Fix swallowed errors in upup subdirectory.

This commit is contained in:
Lars Lehtonen 2017-07-15 11:43:24 -07:00
parent 39ef6433a2
commit 6cf856d972
No known key found for this signature in database
GPG Key ID: 8137D474EBCB04F2
3 changed files with 13 additions and 0 deletions

View File

@ -108,6 +108,9 @@ func parseSSHPublicKey(publicKey string) (ssh.PublicKey, error) {
}
sshPublicKeyBytes, err := base64.StdEncoding.DecodeString(tokens[1])
if err != nil {
return nil, fmt.Errorf("error decoding SSH public key: %q err: %s", publicKey, err)
}
if len(tokens) < 2 {
return nil, fmt.Errorf("error decoding SSH public key: %q", publicKey)
}

View File

@ -92,11 +92,18 @@ func (_ *AttachISO) CheckChanges(a, e, changes *AttachISO) error {
// RenderVSphere executes the actual task logic, for vSphere cloud.
func (_ *AttachISO) RenderVSphere(t *vsphere.VSphereAPITarget, a, e, changes *AttachISO) error {
startupScript, err := changes.BootstrapScript.ResourceNodeUp(changes.IG)
if err != nil {
return err
}
startupStr, err := startupScript.AsString()
if err != nil {
return fmt.Errorf("error rendering startup script: %v", err)
}
dir, err := ioutil.TempDir("", *changes.VM.Name)
if err != nil {
return err
}
defer os.RemoveAll(dir)
// Need this in cloud config file for vSphere CloudProvider

View File

@ -126,6 +126,9 @@ func (c *KubernetesKeystore) StoreKeypair(id string, cert *fi.Certificate, priva
}
secret, err := keypair.Encode()
if err != nil {
return fmt.Errorf("error encoding keypair: %+v err: %s", keypair, err)
}
createdSecret, err := c.client.CoreV1().Secrets(c.namespace).Create(secret)
if err != nil {
return fmt.Errorf("error creating secret %s/%s: %v", secret.Namespace, secret.Name, err)