fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gitrepo: Fix reconcileInclude() includes 

The artifacts built in reconcileInclude() should be persisted by writing
it to includes. reconcileArtifact() later adds includes to the git repo
object status and persists it.

Signed-off-by: Sunny <darkowlzz@protonmail.com>
This commit is contained in:
Sunny 2022-01-26 21:08:13 +05:30 committed by Hidde Beydals
parent 2acb721c35
commit c4fa79c85e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/gitrepository_controller.go
View File

@ -561,6 +561,9 @@ func (r *GitRepositoryReconciler) reconcileInclude(ctx context.Context, obj *sou
conditions.MarkTrue(obj, sourcev1.ArtifactOutdatedCondition, "IncludeChange", conditions.MarkTrue(obj, sourcev1.ArtifactOutdatedCondition, "IncludeChange",
"included artifacts differ from last observed includes") "included artifacts differ from last observed includes")
} }
// Persist the artifactSet.
*includes = artifacts
return sreconcile.ResultSuccess, nil return sreconcile.ResultSuccess, nil
} }

3
controllers/gitrepository_controller_test.go
View File

@ -1029,6 +1029,9 @@ func TestGitRepositoryReconciler_reconcileInclude(t *testing.T) {
got, err := r.reconcileInclude(ctx, obj, &artifact, &includes, tmpDir) got, err := r.reconcileInclude(ctx, obj, &artifact, &includes, tmpDir)
g.Expect(obj.GetConditions()).To(conditions.MatchConditions(tt.assertConditions)) g.Expect(obj.GetConditions()).To(conditions.MatchConditions(tt.assertConditions))
g.Expect(err != nil).To(Equal(tt.wantErr)) g.Expect(err != nil).To(Equal(tt.wantErr))
if err == nil {
g.Expect(len(includes)).To(Equal(len(tt.includes)))
}
g.Expect(got).To(Equal(tt.want)) g.Expect(got).To(Equal(tt.want))
for _, i := range tt.includes { for _, i := range tt.includes {
if i.toPath != "" { if i.toPath != "" {