Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fixed matrix requeueAfterSeconds for PR #10915

Merged
merged 8 commits into from
Jan 17, 2023
Merged

fix: Fixed matrix requeueAfterSeconds for PR #10915

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c08634
Fixed matrix requeueAfterSeconds for PR
Aym3nTN Oct 12, 2022
1e11541
Merge branch 'argoproj:master' into matrix-requeueing-issue
Aym3nTN Dec 22, 2022
fed25d3
A try to make some tests
Dec 22, 2022
9f645ef
Merge branch 'argoproj:master' into matrix-requeueing-issue
Aym3nTN Jan 7, 2023
17e2547
Fixed default test returns the default time
Jan 7, 2023
c139364
Merge branch 'matrix-requeueing-issue' of https://github.com/Aym3nTN/…
Jan 7, 2023
8e721b2
Fixed default test returns the default time
Jan 8, 2023
aeb58e9
Merge branch 'argoproj:master' into matrix-requeueing-issue
Aym3nTN Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions applicationset/generators/matrix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,10 @@ func (m *MatrixGenerator) GetRequeueAfter(appSetGenerator *argoprojiov1alpha1.Ap

for _, r := range appSetGenerator.Matrix.Generators {
base := &argoprojiov1alpha1.ApplicationSetGenerator{
List: r.List,
Clusters: r.Clusters,
Git: r.Git,
List: r.List,
Clusters: r.Clusters,
Git: r.Git,
PullRequest: r.PullRequest,
}
generators := GetRelevantGenerators(base, m.supportedGenerators)

Expand Down
37 changes: 33 additions & 4 deletions applicationset/generators/matrix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ func TestMatrixGetRequeueAfter(t *testing.T) {
Elements: []apiextensionsv1.JSON{{Raw: []byte(`{"cluster": "Cluster","url": "Url"}`)}},
}

pullRequestGenerator := &argoprojiov1alpha1.PullRequestGenerator{}

testCases := []struct {
name string
baseGenerators []argoprojiov1alpha1.ApplicationSetNestedGenerator
Expand Down Expand Up @@ -431,6 +433,31 @@ func TestMatrixGetRequeueAfter(t *testing.T) {
gitGetRequeueAfter: time.Duration(1),
expected: time.Duration(1),
},
{
name: "returns the minimal time for pull request",
baseGenerators: []argoprojiov1alpha1.ApplicationSetNestedGenerator{
{
Git: gitGenerator,
},
{
PullRequest: pullRequestGenerator,
},
},
gitGetRequeueAfter: time.Duration(15 * time.Second),
expected: time.Duration(15 * time.Second),
},
{
name: "returns the default time if no requeueAfterSeconds is provided",
crenshaw-dev marked this conversation as resolved.
Show resolved Hide resolved
baseGenerators: []argoprojiov1alpha1.ApplicationSetNestedGenerator{
{
Git: gitGenerator,
},
{
PullRequest: pullRequestGenerator,
},
},
expected: time.Duration(30 * time.Minute),
},
}

for _, testCase := range testCases {
Expand All @@ -441,16 +468,18 @@ func TestMatrixGetRequeueAfter(t *testing.T) {

for _, g := range testCaseCopy.baseGenerators {
gitGeneratorSpec := argoprojiov1alpha1.ApplicationSetGenerator{
Git: g.Git,
List: g.List,
Git: g.Git,
List: g.List,
PullRequest: g.PullRequest,
}
mock.On("GetRequeueAfter", &gitGeneratorSpec).Return(testCaseCopy.gitGetRequeueAfter, nil)
}

var matrixGenerator = NewMatrixGenerator(
map[string]Generator{
"Git": mock,
"List": &ListGenerator{},
"Git": mock,
"List": &ListGenerator{},
"PullRequest": &PullRequestGenerator{},
},
)

Expand Down