Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-11 12:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1307 from fluxcd/boot-drop-org-repo-autoinit

Browse Source 
Drop AutoInit from Org repository create
This commit is contained in:
Hidde Beydals
2021-04-21 11:44:17 +02:00
committed by GitHub
parent 2fe3934491 43388ec67b
commit 67691e92e3
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/bootstrap/bootstrap_provider.go
View File

@@ -280,11 +280,8 @@ func (b *GitProviderBootstrapper) reconcileOrgRepository(ctx context.Context) (g
}
// go-git-providers has at present some issues with the idempotency
// of the available Reconcile methods, and setting e.g. the default
// branch correctly. Resort to Create with AutoInit until this has
// been resolved.
repo, err = b.provider.OrgRepositories().Create(ctx, repoRef, repoInfo, &gitprovider.RepositoryCreateOptions{
AutoInit: gitprovider.BoolVar(true),
})
// branch correctly. Resort to Create until this has been resolved.
repo, err = b.provider.OrgRepositories().Create(ctx, repoRef, repoInfo)
if err != nil {
return nil, fmt.Errorf("failed to create new Git repository %q: %w", repoRef.String(), err)
}
@@ -348,6 +345,7 @@ func (b *GitProviderBootstrapper) reconcileUserRepository(ctx context.Context) (
repoRef := newUserRepositoryRef(userRef, repoName)
repoInfo := newRepositoryInfo(b.description, b.defaultBranch, b.visibility)
// Reconcile the user repository
repo, err := b.provider.UserRepositories().Get(ctx, repoRef)
if err != nil {
if !errors.Is(err, gitprovider.ErrNotFound) {
@@ -355,9 +353,8 @@ func (b *GitProviderBootstrapper) reconcileUserRepository(ctx context.Context) (
}
// go-git-providers has at present some issues with the idempotency
// of the available Reconcile methods, and setting e.g. the default
// branch correctly. Resort to Create with AutoInit until this has
// been resolved.
repo, err = b.provider.UserRepositories().Create(ctx, repoRef, repoInfo, &gitprovider.RepositoryCreateOptions{})
// branch correctly. Resort to Create until this has been resolved.
repo, err = b.provider.UserRepositories().Create(ctx, repoRef, repoInfo)
if err != nil {
return nil, fmt.Errorf("failed to create new Git repository %q: %w", repoRef.String(), err)
}