Skip to content

Commit d9db01d

Browse files
stefanprodanstefanprodan
authored
Merge pull request #799 from fluxcd/fluxcd/pkg/git-v0.22.0
Update Git dependencies
2 parents 5b945f7 + b88af04 commit d9db01d

File tree

4 files changed

+171
-154
lines changed

4 files changed

+171
-154
lines changed

‎api/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/fluxcd/image-automation-controller/api
22

3-
go 1.22.0
3+
go 1.22.7
44

55
require (
6-
github.com/fluxcd/pkg/apis/meta v1.6.1
6+
github.com/fluxcd/pkg/apis/meta v1.7.0
77
github.com/fluxcd/source-controller/api v1.4.1
8-
k8s.io/apimachinery v0.31.1
9-
sigs.k8s.io/controller-runtime v0.19.0
8+
k8s.io/apimachinery v0.31.3
9+
sigs.k8s.io/controller-runtime v0.19.3
1010
)
1111

1212
require (

‎api/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
44
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/fluxcd/pkg/apis/acl v0.3.0 h1:UOrKkBTOJK+OlZX7n8rWt2rdBmDCoTK+f5TY2LcZi8A=
66
github.com/fluxcd/pkg/apis/acl v0.3.0/go.mod h1:WVF9XjSMVBZuU+HTTiSebGAWMgM7IYexFLyVWbK9bNY=
7-
github.com/fluxcd/pkg/apis/meta v1.6.1 h1:maLhcRJ3P/70ArLCY/LF/YovkxXbX+6sTWZwZQBeNq0=
8-
github.com/fluxcd/pkg/apis/meta v1.6.1/go.mod h1:YndB/gxgGZmKfqpAfFxyCDNFJFP0ikpeJzs66jwq280=
7+
github.com/fluxcd/pkg/apis/meta v1.7.0 h1:pDbPrBGgsiWV4bx8j+hodwv1Ysbj/pHP+FH46aTZOfs=
8+
github.com/fluxcd/pkg/apis/meta v1.7.0/go.mod h1:OJGH7I//SNO6zcso80oBRuf5H8oU8etZDeTgCcH7qHo=
99
github.com/fluxcd/source-controller/api v1.4.1 h1:zV01D7xzHOXWbYXr36lXHWWYS7POARsjLt61Nbh3kVY=
1010
github.com/fluxcd/source-controller/api v1.4.1/go.mod h1:gSjg57T+IG66SsBR0aquv+DFrm4YyBNpKIJVDnu3Ya8=
1111
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
@@ -101,14 +101,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
101101
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
102102
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
103103
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
104-
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
105-
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
104+
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
105+
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
106106
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
107107
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
108108
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
109109
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
110-
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
111-
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
110+
sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
111+
sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
112112
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
113113
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
114114
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎go.mod

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
module github.com/fluxcd/image-automation-controller
22

3-
go 1.22.5
3+
go 1.22.7
44

55
replace github.com/fluxcd/image-automation-controller/api => ./api
66

7-
// Pin kustomize to v5.4.0
7+
// Pin kustomize to v5.5.0
88
replace (
9-
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.17.0
10-
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.17.0
9+
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.18.0
10+
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.18.1
1111
)
1212

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.0-alpha.5-proton
17-
github.com/cyphar/filepath-securejoin v0.3.2
16+
github.com/ProtonMail/go-crypto v1.1.3
17+
github.com/cyphar/filepath-securejoin v0.3.5
1818
github.com/fluxcd/image-automation-controller/api v0.39.0
1919
github.com/fluxcd/image-reflector-controller/api v0.33.0
20-
github.com/fluxcd/pkg/apis/acl v0.3.0
21-
github.com/fluxcd/pkg/apis/event v0.10.1
22-
github.com/fluxcd/pkg/apis/meta v1.6.1
23-
github.com/fluxcd/pkg/auth v0.0.1
24-
github.com/fluxcd/pkg/git v0.21.0
25-
github.com/fluxcd/pkg/git/gogit v0.21.0
26-
github.com/fluxcd/pkg/gittestserver v0.13.1
27-
github.com/fluxcd/pkg/runtime v0.49.1
28-
github.com/fluxcd/pkg/ssh v0.14.1
20+
github.com/fluxcd/pkg/apis/acl v0.4.0
21+
github.com/fluxcd/pkg/apis/event v0.11.0
22+
github.com/fluxcd/pkg/apis/meta v1.7.0
23+
github.com/fluxcd/pkg/auth v0.1.0
24+
github.com/fluxcd/pkg/git v0.22.0
25+
github.com/fluxcd/pkg/git/gogit v0.22.0
26+
github.com/fluxcd/pkg/gittestserver v0.14.0
27+
github.com/fluxcd/pkg/runtime v0.50.0
28+
github.com/fluxcd/pkg/ssh v0.15.0
2929
github.com/fluxcd/source-controller/api v1.4.1
30-
github.com/go-git/go-billy/v5 v5.5.0
30+
github.com/go-git/go-billy/v5 v5.6.0
3131
github.com/go-git/go-git/v5 v5.12.0
3232
github.com/go-logr/logr v1.4.2
3333
github.com/google/go-containerregistry v0.20.2
34-
github.com/onsi/gomega v1.34.2
34+
github.com/onsi/gomega v1.36.0
3535
github.com/otiai10/copy v1.14.0
3636
github.com/spf13/pflag v1.0.5
37-
k8s.io/api v0.31.1
38-
k8s.io/apimachinery v0.31.1
39-
k8s.io/client-go v0.31.1
37+
k8s.io/api v0.31.3
38+
k8s.io/apimachinery v0.31.3
39+
k8s.io/client-go v0.31.3
4040
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3
41-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
42-
sigs.k8s.io/controller-runtime v0.19.0
43-
sigs.k8s.io/kustomize/kyaml v0.17.2
41+
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
42+
sigs.k8s.io/controller-runtime v0.19.3
43+
sigs.k8s.io/kustomize/kyaml v0.18.1
4444
)
4545

4646
require (
4747
dario.cat/mergo v1.0.1 // indirect
48-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
49-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
48+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
49+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
5050
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
5151
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5252
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
5353
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5454
github.com/Masterminds/goutils v1.1.1 // indirect
55-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
55+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
5656
github.com/Microsoft/go-winio v0.6.1 // indirect
5757
github.com/beorn7/perks v1.0.1 // indirect
5858
github.com/blang/semver/v4 v4.0.0 // indirect
59+
github.com/bradleyfalzon/ghinstallation/v2 v2.12.0 // indirect
5960
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6061
github.com/chai2010/gettext-go v1.0.2 // indirect
61-
github.com/cloudflare/circl v1.4.0 // indirect
62+
github.com/cloudflare/circl v1.5.0 // indirect
6263
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6364
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6465
github.com/emirpasic/gods v1.18.1 // indirect
6566
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6667
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
67-
github.com/fluxcd/cli-utils v0.36.0-flux.9 // indirect
68+
github.com/fluxcd/cli-utils v0.36.0-flux.10 // indirect
6869
github.com/fluxcd/gitkit v0.6.0 // indirect
69-
github.com/fluxcd/pkg/version v0.4.1 // indirect
70-
github.com/fsnotify/fsnotify v1.7.0 // indirect
70+
github.com/fluxcd/pkg/version v0.5.0 // indirect
7171
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7272
github.com/go-errors/errors v1.5.1 // indirect
7373
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -77,12 +77,15 @@ require (
7777
github.com/go-openapi/swag v0.23.0 // indirect
7878
github.com/gofrs/uuid v4.4.0+incompatible // indirect
7979
github.com/gogo/protobuf v1.3.2 // indirect
80+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
8081
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
8182
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8283
github.com/golang/protobuf v1.5.4 // indirect
8384
github.com/google/btree v1.1.2 // indirect
8485
github.com/google/gnostic-models v0.6.8 // indirect
8586
github.com/google/go-cmp v0.6.0 // indirect
87+
github.com/google/go-github/v66 v66.0.0 // indirect
88+
github.com/google/go-querystring v1.1.0 // indirect
8689
github.com/google/gofuzz v1.2.0 // indirect
8790
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8891
github.com/google/uuid v1.6.0 // indirect
@@ -116,7 +119,7 @@ require (
116119
github.com/pjbgf/sha1cd v0.3.0 // indirect
117120
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
118121
github.com/pkg/errors v0.9.1 // indirect
119-
github.com/prometheus/client_golang v1.20.3 // indirect
122+
github.com/prometheus/client_golang v1.20.5 // indirect
120123
github.com/prometheus/client_model v0.6.1 // indirect
121124
github.com/prometheus/common v0.55.0 // indirect
122125
github.com/prometheus/procfs v0.15.1 // indirect
@@ -129,34 +132,33 @@ require (
129132
github.com/x448/float16 v0.8.4 // indirect
130133
github.com/xanzy/ssh-agent v0.3.3 // indirect
131134
github.com/xlab/treeprint v1.2.0 // indirect
132-
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
133135
go.uber.org/multierr v1.11.0 // indirect
134136
go.uber.org/zap v1.27.0 // indirect
135-
golang.org/x/crypto v0.27.0 // indirect
137+
golang.org/x/crypto v0.30.0 // indirect
136138
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
137-
golang.org/x/mod v0.21.0 // indirect
138-
golang.org/x/net v0.29.0 // indirect
139-
golang.org/x/oauth2 v0.22.0 // indirect
140-
golang.org/x/sync v0.8.0 // indirect
141-
golang.org/x/sys v0.25.0 // indirect
142-
golang.org/x/term v0.24.0 // indirect
143-
golang.org/x/text v0.18.0 // indirect
144-
golang.org/x/time v0.6.0 // indirect
145-
golang.org/x/tools v0.25.0 // indirect
139+
golang.org/x/mod v0.22.0 // indirect
140+
golang.org/x/net v0.32.0 // indirect
141+
golang.org/x/oauth2 v0.24.0 // indirect
142+
golang.org/x/sync v0.10.0 // indirect
143+
golang.org/x/sys v0.28.0 // indirect
144+
golang.org/x/term v0.27.0 // indirect
145+
golang.org/x/text v0.21.0 // indirect
146+
golang.org/x/time v0.8.0 // indirect
147+
golang.org/x/tools v0.28.0 // indirect
146148
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
147-
google.golang.org/protobuf v1.34.2 // indirect
149+
google.golang.org/protobuf v1.35.1 // indirect
148150
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
149151
gopkg.in/inf.v0 v0.9.1 // indirect
150152
gopkg.in/warnings.v0 v0.1.2 // indirect
151153
gopkg.in/yaml.v2 v2.4.0 // indirect
152154
gopkg.in/yaml.v3 v3.0.1 // indirect
153-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
154-
k8s.io/cli-runtime v0.31.1 // indirect
155-
k8s.io/component-base v0.31.1 // indirect
155+
k8s.io/apiextensions-apiserver v0.31.3 // indirect
156+
k8s.io/cli-runtime v0.31.3 // indirect
157+
k8s.io/component-base v0.31.3 // indirect
156158
k8s.io/klog/v2 v2.130.1 // indirect
157-
k8s.io/kubectl v0.31.1 // indirect
159+
k8s.io/kubectl v0.31.3 // indirect
158160
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
159-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
161+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
160162
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
161163
sigs.k8s.io/yaml v1.4.0 // indirect
162164
)

0 commit comments

Comments
 (0)