Skip to content

Commit 16fed89

Browse files
author
Paulo Gomes
authored
Merge pull request #959 from aryan9600/bump-git-v0.7.0
gitrepo: bump git packages
2 parents bd5eaca + b98b9a9 commit 16fed89

File tree

3 files changed

+77
-51
lines changed

3 files changed

+77
-51
lines changed

‎controllers/gitrepository_controller.go‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import (
4646
"github.com/fluxcd/pkg/git"
4747
"github.com/fluxcd/pkg/git/gogit"
4848
"github.com/fluxcd/pkg/git/libgit2"
49+
"github.com/fluxcd/pkg/git/repository"
4950
"github.com/fluxcd/pkg/runtime/conditions"
5051
helper "github.com/fluxcd/pkg/runtime/controller"
5152
"github.com/fluxcd/pkg/runtime/patch"
@@ -733,7 +734,7 @@ func (r *GitRepositoryReconciler) gitCheckout(ctx context.Context,
733734
obj *sourcev1.GitRepository, authOpts *git.AuthOptions, dir string,
734735
optimized bool, gitImplementation string) (*git.Commit, error) {
735736
// Configure checkout strategy.
736-
cloneOpts := git.CloneOptions{
737+
cloneOpts := repository.CloneOptions{
737738
RecurseSubmodules: obj.Spec.RecurseSubmodules,
738739
ShallowClone: true,
739740
}
@@ -756,14 +757,22 @@ func (r *GitRepositoryReconciler) gitCheckout(ctx context.Context,
756757
gitCtx, cancel := context.WithTimeout(ctx, obj.Spec.Timeout.Duration)
757758
defer cancel()
758759

759-
var gitReader git.RepositoryReader
760+
var gitReader repository.Reader
760761
var err error
761762

762763
switch gitImplementation {
763764
case sourcev1.LibGit2Implementation:
764-
gitReader, err = libgit2.NewClient(dir, authOpts)
765+
clientOpts := []libgit2.ClientOption{libgit2.WithDiskStorage()}
766+
if authOpts.Transport == git.HTTP {
767+
clientOpts = append(clientOpts, libgit2.WithInsecureCredentialsOverHTTP())
768+
}
769+
gitReader, err = libgit2.NewClient(dir, authOpts, clientOpts...)
765770
case sourcev1.GoGitImplementation:
766-
gitReader, err = gogit.NewClient(dir, authOpts)
771+
clientOpts := []gogit.ClientOption{gogit.WithDiskStorage()}
772+
if authOpts.Transport == git.HTTP {
773+
clientOpts = append(clientOpts, gogit.WithInsecureCredentialsOverHTTP())
774+
}
775+
gitReader, err = gogit.NewClient(dir, authOpts, clientOpts...)
767776
default:
768777
err = fmt.Errorf("invalid Git implementation: %s", gitImplementation)
769778
}

‎go.mod‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ require (
3333
github.com/docker/go-units v0.5.0
3434
github.com/fluxcd/pkg/apis/event v0.1.0
3535
github.com/fluxcd/pkg/apis/meta v0.17.0
36-
github.com/fluxcd/pkg/git v0.6.1
37-
github.com/fluxcd/pkg/git/gogit v0.0.0-20221026111216-11a3405b2580
38-
github.com/fluxcd/pkg/git/libgit2 v0.0.0-20221026111216-11a3405b2580
39-
github.com/fluxcd/pkg/gittestserver v0.7.0
36+
github.com/fluxcd/pkg/git v0.7.0
37+
github.com/fluxcd/pkg/git/gogit v0.2.0
38+
github.com/fluxcd/pkg/git/libgit2 v0.3.0
39+
github.com/fluxcd/pkg/gittestserver v0.8.0
4040
github.com/fluxcd/pkg/helmtestserver v0.9.0
4141
github.com/fluxcd/pkg/lockedfile v0.1.0
4242
github.com/fluxcd/pkg/masktoken v0.2.0
4343
github.com/fluxcd/pkg/oci v0.14.0
4444
github.com/fluxcd/pkg/runtime v0.23.0
4545
github.com/fluxcd/pkg/sourceignore v0.2.0
46-
github.com/fluxcd/pkg/ssh v0.6.0
46+
github.com/fluxcd/pkg/ssh v0.7.0
4747
github.com/fluxcd/pkg/testserver v0.4.0
4848
github.com/fluxcd/pkg/untar v0.2.0
4949
github.com/fluxcd/pkg/version v0.2.0
@@ -56,21 +56,21 @@ require (
5656
github.com/google/uuid v1.3.0
5757
github.com/libgit2/git2go/v34 v34.0.0
5858
github.com/minio/minio-go/v7 v7.0.43
59-
github.com/onsi/gomega v1.24.0
59+
github.com/onsi/gomega v1.24.1
6060
github.com/otiai10/copy v1.9.0
6161
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
6262
github.com/prometheus/client_golang v1.14.0
6363
github.com/sigstore/cosign v1.13.1
6464
github.com/sigstore/sigstore v1.4.5
6565
github.com/sirupsen/logrus v1.9.0
6666
github.com/spf13/pflag v1.0.5
67-
golang.org/x/crypto v0.1.0
67+
golang.org/x/crypto v0.2.0
6868
golang.org/x/sync v0.1.0
6969
google.golang.org/api v0.103.0
7070
gotest.tools v2.2.0+incompatible
7171
helm.sh/helm/v3 v3.10.1
7272
k8s.io/api v0.25.3
73-
k8s.io/apimachinery v0.25.3
73+
k8s.io/apimachinery v0.25.4
7474
k8s.io/client-go v0.25.3
7575
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
7676
sigs.k8s.io/cli-utils v0.34.0
@@ -103,7 +103,7 @@ require (
103103
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
104104
github.com/Masterminds/squirrel v1.5.3 // indirect
105105
github.com/Microsoft/go-winio v0.6.0 // indirect
106-
github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 // indirect
106+
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
107107
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
108108
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
109109
github.com/acomagu/bufpipe v1.0.3 // indirect
@@ -148,7 +148,7 @@ require (
148148
github.com/chai2010/gettext-go v1.0.2 // indirect
149149
github.com/chrismellard/docker-credential-acr-env v0.0.0-20221002210726-e883f69e0206 // indirect
150150
github.com/clbanning/mxj/v2 v2.5.6 // indirect
151-
github.com/cloudflare/circl v1.1.0 // indirect
151+
github.com/cloudflare/circl v1.3.0 // indirect
152152
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
153153
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
154154
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
@@ -179,9 +179,9 @@ require (
179179
github.com/fatih/color v1.13.0 // indirect
180180
github.com/felixge/httpsnoop v1.0.3 // indirect
181181
github.com/fluxcd/gitkit v0.6.0 // indirect
182+
github.com/fluxcd/go-git/v5 v5.0.0-20221104190732-329fd6659b10 // indirect
182183
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
183-
github.com/fluxcd/pkg/gitutil v0.2.0 // indirect
184-
github.com/fluxcd/pkg/http/transport v0.0.1 // indirect
184+
github.com/fluxcd/pkg/http/transport v0.1.0 // indirect
185185
github.com/fsnotify/fsnotify v1.5.4 // indirect
186186
github.com/fullstorydev/grpcurl v1.8.7 // indirect
187187
github.com/go-chi/chi v4.1.2+incompatible // indirect
@@ -241,7 +241,7 @@ require (
241241
github.com/hashicorp/golang-lru v0.5.4 // indirect
242242
github.com/hashicorp/hcl v1.0.0 // indirect
243243
github.com/huandu/xstrings v1.3.2 // indirect
244-
github.com/imdario/mergo v0.3.12 // indirect
244+
github.com/imdario/mergo v0.3.13 // indirect
245245
github.com/in-toto/in-toto-golang v0.3.4-0.20220709202702-fa494aaa0add // indirect
246246
github.com/inconshreveable/mousetrap v1.0.1 // indirect
247247
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -335,7 +335,7 @@ require (
335335
github.com/urfave/cli v1.22.7 // indirect
336336
github.com/vbatts/tar-split v0.11.2 // indirect
337337
github.com/xanzy/go-gitlab v0.73.1 // indirect
338-
github.com/xanzy/ssh-agent v0.3.1 // indirect
338+
github.com/xanzy/ssh-agent v0.3.2 // indirect
339339
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
340340
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
341341
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -373,10 +373,10 @@ require (
373373
go.uber.org/zap v1.23.0 // indirect
374374
golang.org/x/exp v0.0.0-20220823124025-807a23277127 // indirect
375375
golang.org/x/mod v0.6.0 // indirect
376-
golang.org/x/net v0.1.0 // indirect
376+
golang.org/x/net v0.2.0 // indirect
377377
golang.org/x/oauth2 v0.1.0 // indirect
378-
golang.org/x/sys v0.1.0 // indirect
379-
golang.org/x/term v0.1.0 // indirect
378+
golang.org/x/sys v0.2.0 // indirect
379+
golang.org/x/term v0.2.0 // indirect
380380
golang.org/x/text v0.4.0 // indirect
381381
golang.org/x/time v0.1.0 // indirect
382382
golang.org/x/tools v0.1.12 // indirect

0 commit comments

Comments
 (0)