Merge pull request #631 from fluxcd/source-ignore-subdir

test: source ignore for subdirectories in a repo

Author: darkowlzz

controllers/gitrepository_controller_test.go

@@ -771,6 +771,21 @@ func TestGitRepositoryReconciler_reconcileArtifact(t *testing.T) {
 				*conditions.TrueCondition(meta.ReadyCondition, meta.SucceededReason, "stored artifact for revision 'main/revision'"),
 			},
 		},
+		{
+			name: "source ignore for subdir ignore patterns",
+			dir:  "testdata/git/repowithsubdirs",
+			beforeFunc: func(obj *sourcev1.GitRepository) {
+				obj.Spec.Interval = metav1.Duration{Duration: interval}
+			},
+			afterFunc: func(t *WithT, obj *sourcev1.GitRepository) {
+				t.Expect(obj.GetArtifact()).ToNot(BeNil())
+				t.Expect(obj.GetArtifact().Checksum).To(Equal("29186e024dde5a414cfc990829c6b2e85f6b3bd2d950f50ca9f418f5d2261d79"))
+			},
+			want: sreconcile.ResultSuccess,
+			assertConditions: []metav1.Condition{
+				*conditions.TrueCondition(meta.ReadyCondition, meta.SucceededReason, "stored artifact for revision 'main/revision'"),
+			},
+		},
 		{
 			name: "Removes ArtifactOutdatedCondition after creating new artifact",
 			dir:  "testdata/git/repository",

controllers/testdata/git/repowithsubdirs/.sourceignore

@@ -0,0 +1,6 @@
+# Exclude all
+/*
+
+# Include manifest directories
+!/apps/
+!/clusters/

controllers/testdata/git/repowithsubdirs/apps/manifest.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: apps

controllers/testdata/git/repowithsubdirs/clusters/manifest.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: clusters