actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-21 15:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #3085 from souleb/reconcile-repository

Browse source 
[bootstrap] Make sure we reconcile with the right reconciliation method
This commit is contained in:
Stefan Prodan 2022-09-12 12:47:27 +03:00 committed by GitHub
commit 0c817378cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/bootstrap/bootstrap_provider.go
View file

@ -298,11 +298,8 @@ func (b *GitProviderBootstrapper) reconcileOrgRepository(ctx context.Context) (g
var changed bool var changed bool
if b.reconcile { if b.reconcile {
// Set default branch before calling Reconcile due to bug described
// above.
repoInfo.DefaultBranch = repo.Get().DefaultBranch
if err = retry(1, 2*time.Second, func() (err error) { if err = retry(1, 2*time.Second, func() (err error) {
repo, changed, err = b.provider.OrgRepositories().Reconcile(ctx, repoRef, repoInfo) changed, err = repo.Reconcile(ctx)
return return
}); err != nil { }); err != nil {
return nil, fmt.Errorf("failed to reconcile Git repository %q: %w", repoRef.String(), err) return nil, fmt.Errorf("failed to reconcile Git repository %q: %w", repoRef.String(), err)
@ -373,12 +370,9 @@ func (b *GitProviderBootstrapper) reconcileUserRepository(ctx context.Context) (
} }
if b.reconcile { if b.reconcile {
// Set default branch before calling Reconcile due to bug described
// above.
repoInfo.DefaultBranch = repo.Get().DefaultBranch
var changed bool var changed bool
if err = retry(1, 2*time.Second, func() (err error) { if err = retry(1, 2*time.Second, func() (err error) {
repo, changed, err = b.provider.UserRepositories().Reconcile(ctx, repoRef, repoInfo) changed, err = repo.Reconcile(ctx)
return return
}); err != nil { }); err != nil {
return nil, fmt.Errorf("failed to reconcile Git repository %q: %w", repoRef.String(), err) return nil, fmt.Errorf("failed to reconcile Git repository %q: %w", repoRef.String(), err)