Skip to content
Snippets Groups Projects
Unverified Commit da6dfd5a authored by Soule BA's avatar Soule BA
Browse files

Use provided ssh hostname to sync with ssh


Signed-off-by: default avatarSoule BA <soule@weave.works>
parent 43181521
No related branches found
No related tags found
No related merge requests found
......@@ -200,8 +200,10 @@ func (b *GitProviderBootstrapper) ReconcileSyncConfig(ctx context.Context, optio
if err != nil {
return err
}
options.URL = syncURL
}
return b.PlainGitBootstrapper.ReconcileSyncConfig(ctx, options)
}
......@@ -414,14 +416,11 @@ func (b *GitProviderBootstrapper) getOrganization(ctx context.Context, subOrgs [
func (b *GitProviderBootstrapper) getCloneURL(repository gitprovider.UserRepository, transport gitprovider.TransportType) (string, error) {
var url string
if cloner, ok := repository.(gitprovider.CloneableURL); ok {
return cloner.GetCloneURL("", transport), nil
url = cloner.GetCloneURL("", transport)
} else {
url = repository.Repository().GetCloneURL(transport)
}
url = repository.Repository().GetCloneURL(transport)
// TODO(hidde): https://github.com/fluxcd/go-git-providers/issues/55
if strings.HasPrefix(url, "https://https://") {
url = strings.TrimPrefix(url, "https://")
}
var err error
if transport == gitprovider.TransportTypeSSH && b.sshHostname != "" {
if url, err = setHostname(url, b.sshHostname); err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment