Specify sshUser, sshKeyfile in kube-apiserver manifest.

Trim space on ssh key so GCE doesn't treat it as 2 lines.
A couple other minor fixes.
This commit is contained in:
CJ Cullen
2015-05-29 14:29:17 -07:00
parent 5115fd5703
commit de9a5f43bc
3 changed files with 8 additions and 2 deletions

View File

@@ -17,6 +17,7 @@ limitations under the License.
package gce_cloud
import (
"bytes"
"fmt"
"io"
"io/ioutil"
@@ -484,6 +485,7 @@ func (gce *GCECloud) AddSSHKeyToAllInstances(user string, keyData []byte) error
if err != nil {
return err
}
keyData = bytes.TrimSpace(keyData)
found := false
for _, item := range project.CommonInstanceMetadata.Items {
if item.Key == "sshKeys" {