Skip to content

Commit

Permalink
Merge pull request #3237 from fluxcd/move/bootstrap
Browse files Browse the repository at this point in the history 
Move bootstrap package from internal to pkg
  • Loading branch information
@phillebaba
phillebaba authored Oct 21, 2022
2 parents e7847b7 + 0343575 commit b82759b
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions cmd/flux/bootstrap_bitbucket_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/spf13/cobra"

"github.com/fluxcd/flux2/internal/bootstrap"
"github.com/fluxcd/flux2/internal/bootstrap/git/gogit"
"github.com/fluxcd/flux2/internal/bootstrap/provider"
"github.com/fluxcd/flux2/internal/flags"
"github.com/fluxcd/flux2/internal/utils"
"github.com/fluxcd/flux2/pkg/bootstrap"
"github.com/fluxcd/flux2/pkg/bootstrap/git/gogit"
"github.com/fluxcd/flux2/pkg/bootstrap/provider"
"github.com/fluxcd/flux2/pkg/manifestgen"
"github.com/fluxcd/flux2/pkg/manifestgen/install"
"github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret"
Expand Down
4 changes: 2 additions & 2 deletions cmd/flux/bootstrap_git.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"

"github.com/fluxcd/flux2/internal/bootstrap"
"github.com/fluxcd/flux2/internal/bootstrap/git/gogit"
"github.com/fluxcd/flux2/internal/flags"
"github.com/fluxcd/flux2/internal/utils"
"github.com/fluxcd/flux2/pkg/bootstrap"
"github.com/fluxcd/flux2/pkg/bootstrap/git/gogit"
"github.com/fluxcd/flux2/pkg/manifestgen"
"github.com/fluxcd/flux2/pkg/manifestgen/install"
"github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret"
Expand Down
6 changes: 3 additions & 3 deletions cmd/flux/bootstrap_github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/spf13/cobra"

"github.com/fluxcd/flux2/internal/bootstrap"
"github.com/fluxcd/flux2/internal/bootstrap/git/gogit"
"github.com/fluxcd/flux2/internal/bootstrap/provider"
"github.com/fluxcd/flux2/internal/flags"
"github.com/fluxcd/flux2/internal/utils"
"github.com/fluxcd/flux2/pkg/bootstrap"
"github.com/fluxcd/flux2/pkg/bootstrap/git/gogit"
"github.com/fluxcd/flux2/pkg/bootstrap/provider"
"github.com/fluxcd/flux2/pkg/manifestgen"
"github.com/fluxcd/flux2/pkg/manifestgen/install"
"github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret"
Expand Down
6 changes: 3 additions & 3 deletions cmd/flux/bootstrap_gitlab.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/spf13/cobra"

"github.com/fluxcd/flux2/internal/bootstrap"
"github.com/fluxcd/flux2/internal/bootstrap/git/gogit"
"github.com/fluxcd/flux2/internal/bootstrap/provider"
"github.com/fluxcd/flux2/internal/flags"
"github.com/fluxcd/flux2/internal/utils"
"github.com/fluxcd/flux2/pkg/bootstrap"
"github.com/fluxcd/flux2/pkg/bootstrap/git/gogit"
"github.com/fluxcd/flux2/pkg/bootstrap/provider"
"github.com/fluxcd/flux2/pkg/manifestgen"
"github.com/fluxcd/flux2/pkg/manifestgen/install"
"github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret"
Expand Down
0 internal/bootstrap/bootstrap.go → pkg/bootstrap/bootstrap.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/bootstrap/bootstrap_plain_git.go → pkg/bootstrap/bootstrap_plain_git.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"github.com/fluxcd/pkg/kustomize/filesys"
runclient "github.com/fluxcd/pkg/runtime/client"

"github.com/fluxcd/flux2/internal/bootstrap/git"
"github.com/fluxcd/flux2/internal/utils"
"github.com/fluxcd/flux2/pkg/bootstrap/git"
"github.com/fluxcd/flux2/pkg/log"
"github.com/fluxcd/flux2/pkg/manifestgen/install"
"github.com/fluxcd/flux2/pkg/manifestgen/kustomization"
Expand Down
4 changes: 2 additions & 2 deletions internal/bootstrap/bootstrap_provider.go → pkg/bootstrap/bootstrap_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (

"github.com/fluxcd/go-git-providers/gitprovider"

"github.com/fluxcd/flux2/internal/bootstrap/git"
"github.com/fluxcd/flux2/internal/bootstrap/provider"
"github.com/fluxcd/flux2/pkg/bootstrap/git"
"github.com/fluxcd/flux2/pkg/bootstrap/provider"
"github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret"
"github.com/fluxcd/flux2/pkg/manifestgen/sync"
)
Expand Down
0 internal/bootstrap/git/commit_options.go → pkg/bootstrap/git/commit_options.go
View file
File renamed without changes.
0 internal/bootstrap/git/git.go → pkg/bootstrap/git/git.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/bootstrap/git/gogit/gogit.go → pkg/bootstrap/git/gogit/gogit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-git/go-git/v5/plumbing/transport"

"github.com/fluxcd/flux2/internal/bootstrap/git"
"github.com/fluxcd/flux2/pkg/bootstrap/git"
)

type GoGit struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/bootstrap/git/gogit/gogit_test.go → pkg/bootstrap/git/gogit/gogit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package gogit
import (
"testing"

"github.com/fluxcd/flux2/internal/bootstrap/git"
"github.com/fluxcd/flux2/pkg/bootstrap/git"
)

func TestGetOpenPgpEntity(t *testing.T) {
Expand Down
0 .../bootstrap/git/gogit/testdata/private.key → pkg/bootstrap/git/gogit/testdata/private.key
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/bootstrap/options.go → pkg/bootstrap/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

runclient "github.com/fluxcd/pkg/runtime/client"

"github.com/fluxcd/flux2/internal/bootstrap/git"
"github.com/fluxcd/flux2/pkg/bootstrap/git"
"github.com/fluxcd/flux2/pkg/log"
)

Expand Down
0 internal/bootstrap/provider/factory.go → pkg/bootstrap/provider/factory.go
View file
File renamed without changes.
0 internal/bootstrap/provider/provider.go → pkg/bootstrap/provider/provider.go
View file
File renamed without changes.

0 comments on commit b82759b

Please sign in to comment.