Merge pull request #351 from fluxcd/fix-ignore-domain-gitrepo

Configure ignore domain for GitRepository rules
fluxcd · Apr 23, 2021 · a6f3458 · a6f3458
2 parents 14cf348 + 8c27e0a
commit a6f3458
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -272,15 +273,16 @@ func (r *GitRepositoryReconciler) reconcile(ctx context.Context, repository sour
 	defer unlock()
 
 	// archive artifact and check integrity
-	ps, err := sourceignore.LoadIgnorePatterns(tmpGit, nil)
+	ignoreDomain := strings.Split(tmpGit, string(filepath.Separator))
+	ps, err := sourceignore.LoadIgnorePatterns(tmpGit, ignoreDomain)
 	if err != nil {
 		err = fmt.Errorf(".sourceignore error: %w", err)
 		return sourcev1.GitRepositoryNotReady(repository, sourcev1.StorageOperationFailedReason, err.Error()), err
 	}
 	if repository.Spec.Ignore != nil {
-		ps = append(ps, sourceignore.ReadPatterns(strings.NewReader(*repository.Spec.Ignore), nil)...)
+		ps = append(ps, sourceignore.ReadPatterns(strings.NewReader(*repository.Spec.Ignore), ignoreDomain)...)
 	}
-	if err := r.Storage.Archive(&artifact, tmpGit, SourceIgnoreFilter(ps, nil)); err != nil {
+	if err := r.Storage.Archive(&artifact, tmpGit, SourceIgnoreFilter(ps, ignoreDomain)); err != nil {
 		err = fmt.Errorf("storage archive error: %w", err)
 		return sourcev1.GitRepositoryNotReady(repository, sourcev1.StorageOperationFailedReason, err.Error()), err
 	}