Merge pull request #780 from JoshVanL/automated-cherry-pick-of-#778-o…

…rigin-release-0.6 Automated cherry pick of #775
jetstack · Mar 15, 2019 · 0f45b19 · 0f45b19
2 parents 9886443 + 3d66531
commit 0f45b19
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/pkg/tarmak/cluster/cluster.go b/pkg/tarmak/cluster/cluster.go
@@ -731,9 +731,6 @@ func (c *Cluster) ConfigPath() string {
 }
 
 func (c *Cluster) SSHConfigPath() string {
-	if c.Type() == clusterv1alpha1.ClusterTypeClusterMulti {
-		return filepath.Join(c.Environment().Tarmak().ConfigPath(), c.Environment().HubName(), "ssh_config")
-	}
 	return filepath.Join(c.ConfigPath(), "ssh_config")
 }
 

diff --git a/pkg/tarmak/ssh/ssh.go b/pkg/tarmak/ssh/ssh.go
@@ -70,15 +70,14 @@ func (s *SSH) WriteConfig(c interfaces.Cluster) error {
 		return err
 	}
 
-	knownHostsPath := s.tarmak.Cluster().SSHHostKeysPath()
+	knownHostsPath := c.SSHHostKeysPath()
 
+	// open file for appending
 	knownHostsFile, err := os.OpenFile(
-		knownHostsPath,
-		os.O_APPEND|os.O_WRONLY|os.O_CREATE,
-		0600,
-	)
+		knownHostsPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY,
+		0600)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to open known hosts file: %s", err)
 	}
 	defer knownHostsFile.Close()
 

diff --git a/pkg/tarmak/tarmak.go b/pkg/tarmak/tarmak.go
@@ -178,6 +178,7 @@ func (t *Tarmak) writeSSHConfigForClusterHosts() error {
 		if errCluster != nil {
 			return fmt.Errorf("failed to retrieve current cluster name: %s", errCluster)
 		}
+
 		return fmt.Errorf("failed to write ssh config for current cluster '%s': %v", clusterName, err)
 	}