From ea62cb5fc9af88ed9bc6bc8a5b63f5a05d450b94 Mon Sep 17 00:00:00 2001
From: Tobias Jakobsson <jakobsson.tobias@gmail.com>
Date: Tue, 4 May 2021 16:41:17 +0200
Subject: [PATCH] Use proper Host configuration for SSH
This removes the usage of Hostname() which does not honor configured SSH
port to be used.
Resolves: #1377
See also: #1101, #1102
Signed-off-by: Tobias Jakobsson <jakobsson.tobias@gmail.com>
---
cmd/flux/bootstrap_git.go | 1 -
1 file changed, 1 deletion(-)
diff --git a/cmd/flux/bootstrap_git.go b/cmd/flux/bootstrap_git.go
index 536fa7de..243a8e3a 100644
--- a/cmd/flux/bootstrap_git.go
+++ b/cmd/flux/bootstrap_git.go
@@ -173,7 +173,6 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
// Configure repository URL to match auth config for sync.
repositoryURL.User = url.User(gitArgs.username)
repositoryURL.Scheme = "ssh"
- repositoryURL.Host = repositoryURL.Hostname()
if bootstrapArgs.sshHostname != "" {
repositoryURL.Host = bootstrapArgs.sshHostname
}
--
GitLab