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

Merge pull request #1865 from fluxcd/fix-stalled-errors 

Fix GitRepository controller stalling when it shouldn't
This commit is contained in:
Matheus Pimenta 2025-08-12 14:53:01 +01:00 committed by GitHub
parent a84403c95b 1f4fc2fe87
commit bd6d090ef0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/controller/gitrepository_controller.go
View File

@ -591,7 +591,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, sp *patch
// Validate sparse checkout paths after successful checkout. // Validate sparse checkout paths after successful checkout.
if err := r.validateSparseCheckoutPaths(ctx, obj, dir); err != nil { if err := r.validateSparseCheckoutPaths(ctx, obj, dir); err != nil {
e := serror.NewStalling( e := serror.NewGeneric(
fmt.Errorf("failed to sparse checkout directories : %w", err), fmt.Errorf("failed to sparse checkout directories : %w", err),
sourcev1.GitOperationFailedReason, sourcev1.GitOperationFailedReason,
) )
@ -747,7 +747,7 @@ func (r *GitRepositoryReconciler) getAuthOpts(ctx context.Context, obj *sourcev1
default: default:
// analyze secret, if it has github app data, perhaps provider should have been github. // analyze secret, if it has github app data, perhaps provider should have been github.
if appID := authData[github.KeyAppID]; len(appID) != 0 { if appID := authData[github.KeyAppID]; len(appID) != 0 {
e := serror.NewStalling( e := serror.NewGeneric(
fmt.Errorf("secretRef '%s/%s' has github app data but provider is not set to github", obj.GetNamespace(), obj.Spec.SecretRef.Name), fmt.Errorf("secretRef '%s/%s' has github app data but provider is not set to github", obj.GetNamespace(), obj.Spec.SecretRef.Name),
sourcev1.InvalidProviderConfigurationReason, sourcev1.InvalidProviderConfigurationReason,
) )