Skip to content

Commit 59b50fa

Browse files
stefanprodanstefanprodan
authored
Merge pull request #886 from fluxcd/git-mtls
Update `fluxcd/pkg/git` to v0.26.0 (Git mTLS support)
2 parents 3efde8d + 6ca182e commit 59b50fa

File tree

4 files changed

+96
-96
lines changed

4 files changed

+96
-96
lines changed

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.23.0
55
require (
66
github.com/fluxcd/pkg/apis/meta v1.10.0
77
github.com/fluxcd/source-controller/api v1.5.0
8-
k8s.io/apimachinery v0.32.1
9-
sigs.k8s.io/controller-runtime v0.20.1
8+
k8s.io/apimachinery v0.32.2
9+
sigs.k8s.io/controller-runtime v0.20.4
1010
)
1111

1212
require (
@@ -20,8 +20,8 @@ require (
2020
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2121
github.com/modern-go/reflect2 v1.0.2 // indirect
2222
github.com/x448/float16 v0.8.4 // indirect
23-
golang.org/x/net v0.34.0 // indirect
24-
golang.org/x/text v0.22.0 // indirect
23+
golang.org/x/net v0.39.0 // indirect
24+
golang.org/x/text v0.24.0 // indirect
2525
gopkg.in/inf.v0 v0.9.1 // indirect
2626
k8s.io/klog/v2 v2.130.1 // indirect
2727
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

‎api/go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
3838
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
3939
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
4040
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
41-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
42-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
43-
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
44-
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
41+
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
42+
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
43+
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
44+
github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
4545
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4646
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
4747
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -66,20 +66,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
6666
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6767
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6868
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
69-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
70-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
69+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
70+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
7171
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7272
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7373
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7474
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
7575
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7676
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
77-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
78-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
77+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
78+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
7979
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
8080
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
81-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
82-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
81+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
82+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
8383
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
8484
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
8585
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -97,16 +97,16 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
9797
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
9898
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9999
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
100-
k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
101-
k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
102-
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
103-
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
100+
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
101+
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
102+
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
103+
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
104104
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
105105
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
106106
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
107107
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
108-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
109-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
108+
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
109+
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
110110
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
111111
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
112112
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎go.mod‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ replace (
1313
require (
1414
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6
1515
github.com/Masterminds/sprig/v3 v3.3.0
16-
github.com/ProtonMail/go-crypto v1.1.5
16+
github.com/ProtonMail/go-crypto v1.1.6
1717
github.com/cyphar/filepath-securejoin v0.4.1
1818
github.com/fluxcd/image-automation-controller/api v0.40.0
1919
github.com/fluxcd/image-reflector-controller/api v0.34.0
@@ -22,25 +22,25 @@ require (
2222
github.com/fluxcd/pkg/apis/meta v1.10.0
2323
github.com/fluxcd/pkg/auth v0.9.0
2424
github.com/fluxcd/pkg/cache v0.7.0
25-
github.com/fluxcd/pkg/git v0.25.0
26-
github.com/fluxcd/pkg/git/gogit v0.25.0
25+
github.com/fluxcd/pkg/git v0.26.0
26+
github.com/fluxcd/pkg/git/gogit v0.26.0
2727
github.com/fluxcd/pkg/gittestserver v0.16.0
28-
github.com/fluxcd/pkg/runtime v0.53.1
28+
github.com/fluxcd/pkg/runtime v0.58.0
2929
github.com/fluxcd/pkg/ssh v0.17.0
3030
github.com/fluxcd/source-controller/api v1.5.0
3131
github.com/go-git/go-billy/v5 v5.6.2
32-
github.com/go-git/go-git/v5 v5.13.2
32+
github.com/go-git/go-git/v5 v5.16.0
3333
github.com/go-logr/logr v1.4.2
3434
github.com/google/go-containerregistry v0.20.3
3535
github.com/onsi/gomega v1.36.2
3636
github.com/otiai10/copy v1.14.1
3737
github.com/spf13/pflag v1.0.6
38-
k8s.io/api v0.32.1
39-
k8s.io/apimachinery v0.32.1
40-
k8s.io/client-go v0.32.1
38+
k8s.io/api v0.32.2
39+
k8s.io/apimachinery v0.32.2
40+
k8s.io/client-go v0.32.2
4141
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
4242
k8s.io/utils v0.0.0-20241210054802-24370beab758
43-
sigs.k8s.io/controller-runtime v0.20.1
43+
sigs.k8s.io/controller-runtime v0.20.4
4444
sigs.k8s.io/kustomize/kyaml v0.19.0
4545
)
4646

@@ -60,7 +60,7 @@ require (
6060
github.com/bradleyfalzon/ghinstallation/v2 v2.14.0 // indirect
6161
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6262
github.com/chai2010/gettext-go v1.0.2 // indirect
63-
github.com/cloudflare/circl v1.5.0 // indirect
63+
github.com/cloudflare/circl v1.6.1 // indirect
6464
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6565
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6666
github.com/emirpasic/gods v1.18.1 // indirect
@@ -79,8 +79,8 @@ require (
7979
github.com/go-openapi/swag v0.23.0 // indirect
8080
github.com/gofrs/uuid v4.4.0+incompatible // indirect
8181
github.com/gogo/protobuf v1.3.2 // indirect
82-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
83-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
82+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
83+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
8484
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
8585
github.com/golang/protobuf v1.5.4 // indirect
8686
github.com/google/btree v1.1.3 // indirect
@@ -121,7 +121,7 @@ require (
121121
github.com/pjbgf/sha1cd v0.3.2 // indirect
122122
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
123123
github.com/pkg/errors v0.9.1 // indirect
124-
github.com/prometheus/client_golang v1.20.5 // indirect
124+
github.com/prometheus/client_golang v1.21.0 // indirect
125125
github.com/prometheus/client_model v0.6.1 // indirect
126126
github.com/prometheus/common v0.62.0 // indirect
127127
github.com/prometheus/procfs v0.15.1 // indirect
@@ -136,25 +136,25 @@ require (
136136
github.com/xlab/treeprint v1.2.0 // indirect
137137
go.uber.org/multierr v1.11.0 // indirect
138138
go.uber.org/zap v1.27.0 // indirect
139-
golang.org/x/crypto v0.34.0 // indirect
140-
golang.org/x/net v0.35.0 // indirect
141-
golang.org/x/oauth2 v0.26.0 // indirect
142-
golang.org/x/sync v0.11.0 // indirect
143-
golang.org/x/sys v0.30.0 // indirect
144-
golang.org/x/term v0.29.0 // indirect
145-
golang.org/x/text v0.22.0 // indirect
139+
golang.org/x/crypto v0.37.0 // indirect
140+
golang.org/x/net v0.39.0 // indirect
141+
golang.org/x/oauth2 v0.27.0 // indirect
142+
golang.org/x/sync v0.13.0 // indirect
143+
golang.org/x/sys v0.32.0 // indirect
144+
golang.org/x/term v0.31.0 // indirect
145+
golang.org/x/text v0.24.0 // indirect
146146
golang.org/x/time v0.10.0 // indirect
147147
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
148148
google.golang.org/protobuf v1.36.4 // indirect
149149
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
150150
gopkg.in/inf.v0 v0.9.1 // indirect
151151
gopkg.in/warnings.v0 v0.1.2 // indirect
152152
gopkg.in/yaml.v3 v3.0.1 // indirect
153-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
154-
k8s.io/cli-runtime v0.32.1 // indirect
155-
k8s.io/component-base v0.32.1 // indirect
153+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
154+
k8s.io/cli-runtime v0.32.2 // indirect
155+
k8s.io/component-base v0.32.2 // indirect
156156
k8s.io/klog/v2 v2.130.1 // indirect
157-
k8s.io/kubectl v0.32.1 // indirect
157+
k8s.io/kubectl v0.32.2 // indirect
158158
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
159159
sigs.k8s.io/kustomize/api v0.19.0 // indirect
160160
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect

0 commit comments

Comments
 (0)