Skip to content

Commit

Permalink
fix Git SSH known hosts (#779)
Browse files Browse the repository at this point in the history
Signed-off-by: Roke Jung <roke@redhat.com>
  • Loading branch information
rokej committed Jul 6, 2022
1 parent f7d5122 commit 9668072
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions pkg/utils/gitrepo.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,22 @@ func getConnectionOptions(cloneOptions *GitCloneOption, primary bool) (connectio

options := &git.CloneOptions{
URL: channelConnOptions.RepoURL,
SingleBranch: true,
RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
ReferenceName: cloneOptions.Branch,
}

// The destination directory needs to be created here
err = os.RemoveAll(cloneOptions.DestDir)

if err != nil {
klog.Warning(err, "Failed to remove directory ", cloneOptions.DestDir)
}

err = os.MkdirAll(cloneOptions.DestDir, os.ModePerm)

if err != nil {
return nil, err
}

// If branch name is provided, clone the specified branch only.
Expand Down Expand Up @@ -238,18 +253,6 @@ func getConnectionOptions(cloneOptions *GitCloneOption, primary bool) (connectio
}
}

err = os.RemoveAll(cloneOptions.DestDir)

if err != nil {
klog.Warning(err, "Failed to remove directory ", cloneOptions.DestDir)
}

err = os.MkdirAll(cloneOptions.DestDir, os.ModePerm)

if err != nil {
return nil, err
}

return options, nil
}

Expand Down

0 comments on commit 9668072

Please sign in to comment.