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

feat: update revision for path should not affect sync #350

Merged
merged 3 commits into from
Oct 28, 2024
Merged

feat: update revision for path should not affect sync #350

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32d3762
feat: not throw error in case if update revision for path failed
pasha-codefresh Oct 27, 2024
4c9941b
feat: not throw error in case if update revision for path failed
pasha-codefresh Oct 27, 2024
f1925f1
feat: not throw error in case if update revision for path failed
pasha-codefresh Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions controller/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp

keyManifestGenerateAnnotationVal, keyManifestGenerateAnnotationExists := app.Annotations[v1alpha1.AnnotationKeyManifestGeneratePaths]

logCtx := log.WithField("application", app.QualifiedName())

for i, source := range sources {
if len(revisions) < len(sources) || revisions[i] == "" {
revisions[i] = source.TargetRevision
Expand Down Expand Up @@ -233,15 +235,18 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
HasMultipleSources: app.Spec.HasMultipleSources(),
})
if err != nil {
return nil, nil, false, fmt.Errorf("failed to compare revisions for source %d of %d: %w", i+1, len(sources), err)
}
if updateRevisionResult.Changes {
revisionUpdated = true
logCtx.Warnf("failed to generate manifest for source %d of %d: %v", i+1, len(sources), err)
}

// Generate manifests should use same revision as updateRevisionForPaths, because HEAD revision may be different between these two calls
if updateRevisionResult.Revision != "" {
revision = updateRevisionResult.Revision
if updateRevisionResult != nil {
if updateRevisionResult.Changes {
revisionUpdated = true
}

// Generate manifests should use same revision as updateRevisionForPaths, because HEAD revision may be different between these two calls
if updateRevisionResult.Revision != "" {
revision = updateRevisionResult.Revision
}
}
} else {
// revisionUpdated is set to true if at least one revision is not possible to be updated,
Expand Down Expand Up @@ -287,7 +292,7 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
}

ts.AddCheckpoint("unmarshal_ms")
logCtx := log.WithField("application", app.QualifiedName())

for k, v := range ts.Timings() {
logCtx = logCtx.WithField(k, v.Milliseconds())
}
Expand Down
Loading