kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-15 12:18:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update loader.go

Browse Source
This commit is contained in:
Jeff Regan
2020-12-09 15:17:52 -08:00
committed by GitHub
parent dd946e1343
commit 05eccab823
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/loader/loader.go
View File

@@ -21,24 +21,22 @@ import (
func NewLoader( func NewLoader(
lr LoadRestrictorFunc, lr LoadRestrictorFunc,
target string, fSys filesys.FileSystem) (ifc.Loader, error) { target string, fSys filesys.FileSystem) (ifc.Loader, error) {
ldr, errGet := newLoaderAtGetter(
ldr, errGet := newLoaderAtGetter(target, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget) target, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
if errGet == nil { if errGet == nil {
return ldr, nil return ldr, nil
} }
repoSpec, errGit := git.NewRepoSpecFromUrl(target) repoSpec, errGit := git.NewRepoSpecFromUrl(target)
if errGit == nil { if errGit == nil {
// The target qualifies as a remote git target. // The target qualifies as a remote git target.
return newLoaderAtGitClone( return newLoaderAtGitClone(
repoSpec, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget) repoSpec, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
} }
root, errDir := demandDirectoryRoot(fSys, target) root, errDir := demandDirectoryRoot(fSys, target)
if errDir == nil { if errDir == nil {
return newLoaderAtConfirmedDir(lr, root, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget), nil return newLoaderAtConfirmedDir(
lr, root, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget), nil
} }
return nil, fmt.Errorf( return nil, fmt.Errorf(
"error creating new loader with git: %v, dir: %v, get: %v", "error creating new loader with git: %v, dir: %v, get: %v",
errGit, errDir, errGet) errGit, errDir, errGet)