github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Specify sshUser, sshKeyfile in kube-apiserver manifest.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/master/master.go
View File

@@ -340,6 +340,8 @@ func New(c *Config) *Master {
serviceReadWriteIP: serviceReadWriteIP,
// TODO: serviceReadWritePort should be passed in as an argument, it may not always be 443
serviceReadWritePort: 443,
installSSHKey: c.InstallSSHKey,
}
var handlerContainer *restful.Container
@@ -827,7 +829,9 @@ func (m *Master) generateSSHKey(user, keyfile string) error {
if err != nil {
return err
}
ioutil.WriteFile(keyfile, util.EncodePrivateKey(private), 0600)
if err := ioutil.WriteFile(keyfile, util.EncodePrivateKey(private), 0600); err != nil {
return err
}
data, err := util.EncodeSSHKey(public)
if err != nil {
return err