Skip to content

Commit e454604

Browse files
authored
Merge pull request #1352 from fluxcd/up-deps-api
Update API dependencies
2 parents 4a9a093 + bb09c69 commit e454604

File tree

4 files changed

+182
-248
lines changed

4 files changed

+182
-248
lines changed

api/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/fluxcd/pkg/apis/meta v1.10.0
88
k8s.io/apiextensions-apiserver v0.32.1
99
k8s.io/apimachinery v0.32.1
10-
sigs.k8s.io/controller-runtime v0.19.3
10+
sigs.k8s.io/controller-runtime v0.20.1
1111
)
1212

1313
// Fix CVE-2022-28948
@@ -22,6 +22,7 @@ require (
2222
github.com/kr/pretty v0.3.1 // indirect
2323
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2424
github.com/modern-go/reflect2 v1.0.2 // indirect
25+
github.com/rogpeppe/go-internal v1.12.0 // indirect
2526
github.com/x448/float16 v0.8.4 // indirect
2627
golang.org/x/net v0.34.0 // indirect
2728
golang.org/x/text v0.21.0 // indirect

api/go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
4444
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4545
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
4646
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
47-
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
4847
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
48+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
49+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
4950
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
5051
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
5152
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -106,8 +107,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
106107
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
107108
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
108109
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
109-
sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
110-
sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
110+
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
111+
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
111112
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
112113
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
113114
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

go.mod

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ replace github.com/opencontainers/go-digest => github.com/opencontainers/go-dige
1111
require (
1212
filippo.io/age v1.2.1
1313
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6
14-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
15-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
16-
github.com/aws/aws-sdk-go-v2/credentials v1.17.47
14+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
15+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
16+
github.com/aws/aws-sdk-go-v2/credentials v1.17.57
1717
github.com/cyphar/filepath-securejoin v0.4.1
1818
github.com/dimchansky/utfbom v1.1.1
1919
github.com/fluxcd/cli-utils v0.36.0-flux.12
@@ -29,7 +29,7 @@ require (
2929
github.com/fluxcd/pkg/tar v0.11.0
3030
github.com/fluxcd/pkg/testserver v0.10.0
3131
github.com/fluxcd/source-controller/api v1.4.1
32-
github.com/getsops/sops/v3 v3.9.2
32+
github.com/getsops/sops/v3 v3.9.4
3333
github.com/hashicorp/vault/api v1.15.0
3434
github.com/onsi/gomega v1.36.2
3535
github.com/opencontainers/go-digest v1.0.0
@@ -56,66 +56,66 @@ replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
5656

5757
require (
5858
cel.dev/expr v0.19.1 // indirect
59-
cloud.google.com/go v0.116.0 // indirect
60-
cloud.google.com/go/auth v0.10.2 // indirect
61-
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
62-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
63-
cloud.google.com/go/iam v1.2.2 // indirect
64-
cloud.google.com/go/kms v1.20.1 // indirect
65-
cloud.google.com/go/longrunning v0.6.2 // indirect
66-
cloud.google.com/go/monitoring v1.21.2 // indirect
67-
cloud.google.com/go/storage v1.47.0 // indirect
59+
cloud.google.com/go v0.117.0 // indirect
60+
cloud.google.com/go/auth v0.14.0 // indirect
61+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
62+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
63+
cloud.google.com/go/iam v1.3.0 // indirect
64+
cloud.google.com/go/kms v1.20.5 // indirect
65+
cloud.google.com/go/longrunning v0.6.3 // indirect
66+
cloud.google.com/go/monitoring v1.22.0 // indirect
67+
cloud.google.com/go/storage v1.50.0 // indirect
6868
dario.cat/mergo v1.0.1 // indirect
6969
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
7070
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.0 // indirect
7171
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
7272
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
73-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.1 // indirect
74-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
75-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
76-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
73+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
74+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
75+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
76+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
7777
github.com/MakeNowJust/heredoc v1.0.0 // indirect
7878
github.com/Microsoft/go-winio v0.6.2 // indirect
7979
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
8080
github.com/ProtonMail/go-crypto v1.1.5 // indirect
8181
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
82-
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
82+
github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
8383
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
84-
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
85-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
86-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.42 // indirect
87-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
88-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
84+
github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect
85+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
86+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.53 // indirect
87+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
88+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
8989
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
90-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
91-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
92-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
93-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
94-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
95-
github.com/aws/aws-sdk-go-v2/service/kms v1.37.7 // indirect
96-
github.com/aws/aws-sdk-go-v2/service/s3 v1.70.0 // indirect
97-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
100-
github.com/aws/smithy-go v1.22.1 // indirect
90+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.28 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.2 // indirect
93+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
94+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.9 // indirect
95+
github.com/aws/aws-sdk-go-v2/service/kms v1.37.13 // indirect
96+
github.com/aws/aws-sdk-go-v2/service/s3 v1.74.0 // indirect
97+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
100+
github.com/aws/smithy-go v1.22.2 // indirect
101101
github.com/beorn7/perks v1.0.1 // indirect
102102
github.com/blang/semver v3.5.1+incompatible // indirect
103103
github.com/blang/semver/v4 v4.0.0 // indirect
104104
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
105105
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
106106
github.com/cespare/xxhash/v2 v2.3.0 // indirect
107107
github.com/chai2010/gettext-go v1.0.2 // indirect
108-
github.com/cloudflare/circl v1.4.0 // indirect
109-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
110-
github.com/containerd/continuity v0.4.3 // indirect
111-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
108+
github.com/cloudflare/circl v1.5.0 // indirect
109+
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
110+
github.com/containerd/continuity v0.4.5 // indirect
111+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
112112
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
113-
github.com/docker/cli v27.3.1+incompatible // indirect
114-
github.com/docker/docker v27.3.1+incompatible // indirect
113+
github.com/docker/cli v27.4.1+incompatible // indirect
114+
github.com/docker/docker v27.4.1+incompatible // indirect
115115
github.com/docker/go-connections v0.5.0 // indirect
116116
github.com/docker/go-units v0.5.0 // indirect
117117
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
118-
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
118+
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
119119
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
120120
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
121121
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
@@ -125,7 +125,7 @@ require (
125125
github.com/fluxcd/pkg/sourceignore v0.11.0 // indirect
126126
github.com/fsnotify/fsnotify v1.8.0 // indirect
127127
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
128-
github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe // indirect
128+
github.com/getsops/gopgagent v0.0.0-20241224165529-7044f28e491e // indirect
129129
github.com/go-errors/errors v1.5.1 // indirect
130130
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
131131
github.com/go-git/go-billy/v5 v5.6.2 // indirect
@@ -140,18 +140,17 @@ require (
140140
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
141141
github.com/gogo/protobuf v1.3.2 // indirect
142142
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
143-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
144143
github.com/golang/protobuf v1.5.4 // indirect
145144
github.com/google/btree v1.1.3 // indirect
146145
github.com/google/cel-go v0.23.1 // indirect
147146
github.com/google/gnostic-models v0.6.9 // indirect
148147
github.com/google/go-cmp v0.6.0 // indirect
149148
github.com/google/gofuzz v1.2.0 // indirect
150-
github.com/google/s2a-go v0.1.8 // indirect
149+
github.com/google/s2a-go v0.1.9 // indirect
151150
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
152151
github.com/google/uuid v1.6.0 // indirect
153152
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
154-
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
153+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
155154
github.com/gorilla/websocket v1.5.3 // indirect
156155
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
157156
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -181,6 +180,7 @@ require (
181180
github.com/mitchellh/mapstructure v1.5.0 // indirect
182181
github.com/moby/docker-image-spec v1.3.1 // indirect
183182
github.com/moby/spdystream v0.5.0 // indirect
183+
github.com/moby/sys/user v0.3.0 // indirect
184184
github.com/moby/term v0.5.0 // indirect
185185
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
186186
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -189,7 +189,7 @@ require (
189189
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
190190
github.com/opencontainers/go-digest/blake3 v0.0.0-20240426182413-22b78e47854a // indirect
191191
github.com/opencontainers/image-spec v1.1.0 // indirect
192-
github.com/opencontainers/runc v1.1.14 // indirect
192+
github.com/opencontainers/runc v1.2.3 // indirect
193193
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
194194
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
195195
github.com/pkg/errors v0.9.1 // indirect
@@ -210,15 +210,14 @@ require (
210210
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
211211
github.com/xlab/treeprint v1.2.0 // indirect
212212
github.com/zeebo/blake3 v0.2.4 // indirect
213-
go.opencensus.io v0.24.0 // indirect
214213
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
215-
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
216-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
217-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
214+
go.opentelemetry.io/contrib/detectors/gcp v1.33.0 // indirect
215+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
216+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
218217
go.opentelemetry.io/otel v1.34.0 // indirect
219218
go.opentelemetry.io/otel/metric v1.34.0 // indirect
220-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
221-
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
219+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
220+
go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
222221
go.opentelemetry.io/otel/trace v1.34.0 // indirect
223222
go.uber.org/multierr v1.11.0 // indirect
224223
go.uber.org/zap v1.27.0 // indirect
@@ -231,12 +230,11 @@ require (
231230
golang.org/x/text v0.21.0 // indirect
232231
golang.org/x/time v0.9.0 // indirect
233232
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
234-
google.golang.org/api v0.209.0 // indirect
235-
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
236-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
237-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
238-
google.golang.org/grpc v1.68.0 // indirect
239-
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
233+
google.golang.org/api v0.218.0 // indirect
234+
google.golang.org/genproto v0.0.0-20241223144023-3abc09e42ca8 // indirect
235+
google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 // indirect
236+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
237+
google.golang.org/grpc v1.70.0 // indirect
240238
google.golang.org/protobuf v1.36.4 // indirect
241239
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
242240
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)