Skip to content

Commit 26df08a

Browse files
stefanprodanstefanprodan
committed
Update controller-runtime to v0.21.0
Signed-off-by: Stefan Prodan <[email protected]>
1 parent 0d9ed59 commit 26df08a

File tree

4 files changed

+96
-90
lines changed

4 files changed

+96
-90
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/fluxcd/pkg/apis/acl v0.7.0
77
github.com/fluxcd/pkg/apis/meta v1.12.0
88
k8s.io/apimachinery v0.33.0
9-
sigs.k8s.io/controller-runtime v0.20.4
9+
sigs.k8s.io/controller-runtime v0.21.0
1010
)
1111

1212
// Fix CVE-2022-28948
@@ -17,7 +17,7 @@ require (
1717
github.com/go-logr/logr v1.4.2 // indirect
1818
github.com/gogo/protobuf v1.3.2 // indirect
1919
github.com/json-iterator/go v1.1.12 // indirect
20-
github.com/kr/text v0.2.0 // indirect
20+
github.com/kr/pretty v0.3.1 // indirect
2121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2222
github.com/modern-go/reflect2 v1.0.2 // indirect
2323
github.com/spf13/pflag v1.0.6 // indirect
@@ -26,7 +26,6 @@ require (
2626
golang.org/x/text v0.24.0 // indirect
2727
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2828
gopkg.in/inf.v0 v0.9.1 // indirect
29-
k8s.io/api v0.33.0 // indirect
3029
k8s.io/klog/v2 v2.130.1 // indirect
3130
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
3231
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

‎api/go.sum‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
34
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
5-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
65
github.com/fluxcd/pkg/apis/acl v0.7.0 h1:dMhZJH+g6ZRPjs4zVOAN9vHBd1DcavFgcIFkg5ooOE0=
76
github.com/fluxcd/pkg/apis/acl v0.7.0/go.mod h1:uv7pXXR/gydiX4MUwlQa7vS8JONEDztynnjTvY3JxKQ=
87
github.com/fluxcd/pkg/apis/meta v1.12.0 h1:XW15TKZieC2b7MN8VS85stqZJOx+/b8jATQ/xTUhVYg=
@@ -41,8 +40,10 @@ github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg
4140
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
4241
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
4342
github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
43+
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
4444
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4545
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
46+
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
4647
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
4748
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
4849
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
@@ -103,8 +104,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
103104
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
104105
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
105106
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
106-
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
107-
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
107+
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
108+
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
108109
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
109110
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
110111
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

‎go.mod‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ require (
1818
github.com/Masterminds/semver/v3 v3.3.0
1919
github.com/cyphar/filepath-securejoin v0.4.1
2020
github.com/distribution/distribution/v3 v3.0.0
21-
github.com/docker/cli v27.5.1+incompatible
21+
github.com/docker/cli v28.1.1+incompatible
2222
github.com/docker/go-units v0.5.0
2323
github.com/elazarl/goproxy v1.7.2
2424
github.com/fluxcd/cli-utils v0.36.0-flux.13
2525
github.com/fluxcd/pkg/apis/event v0.17.0
2626
github.com/fluxcd/pkg/apis/meta v1.12.0
27-
github.com/fluxcd/pkg/auth v0.14.0
27+
github.com/fluxcd/pkg/auth v0.15.0
2828
github.com/fluxcd/pkg/cache v0.9.0
2929
github.com/fluxcd/pkg/git v0.31.0
3030
github.com/fluxcd/pkg/git/gogit v0.33.0
@@ -33,7 +33,7 @@ require (
3333
github.com/fluxcd/pkg/lockedfile v0.6.0
3434
github.com/fluxcd/pkg/masktoken v0.7.0
3535
github.com/fluxcd/pkg/oci v0.49.0
36-
github.com/fluxcd/pkg/runtime v0.59.0
36+
github.com/fluxcd/pkg/runtime v0.60.0
3737
github.com/fluxcd/pkg/sourceignore v0.12.0
3838
github.com/fluxcd/pkg/ssh v0.18.0
3939
github.com/fluxcd/pkg/tar v0.12.0
@@ -44,27 +44,27 @@ require (
4444
github.com/go-git/go-billy/v5 v5.6.2
4545
github.com/go-git/go-git/v5 v5.16.0
4646
github.com/go-logr/logr v1.4.2
47-
github.com/google/go-containerregistry v0.20.3
47+
github.com/google/go-containerregistry v0.20.5
4848
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20241111191718-6bce25ecf029
4949
github.com/google/uuid v1.6.0
50-
github.com/minio/minio-go/v7 v7.0.91
51-
github.com/notaryproject/notation-core-go v1.2.0
52-
github.com/notaryproject/notation-go v1.3.0
50+
github.com/minio/minio-go/v7 v7.0.92
51+
github.com/notaryproject/notation-core-go v1.3.0
52+
github.com/notaryproject/notation-go v1.3.2
5353
github.com/onsi/gomega v1.37.0
5454
github.com/opencontainers/go-digest v1.0.0
5555
github.com/opencontainers/go-digest/blake3 v0.0.0-20240426182413-22b78e47854a
5656
github.com/opencontainers/image-spec v1.1.1
57-
github.com/ory/dockertest/v3 v3.11.0
57+
github.com/ory/dockertest/v3 v3.12.0
5858
github.com/otiai10/copy v1.14.1
5959
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
6060
github.com/prometheus/client_golang v1.22.0
6161
github.com/sigstore/cosign/v2 v2.4.1
6262
github.com/sigstore/sigstore v1.8.15
6363
github.com/sirupsen/logrus v1.9.3
6464
github.com/spf13/pflag v1.0.6
65-
golang.org/x/crypto v0.37.0
66-
golang.org/x/oauth2 v0.29.0
67-
golang.org/x/sync v0.13.0
65+
golang.org/x/crypto v0.38.0
66+
golang.org/x/oauth2 v0.30.0
67+
golang.org/x/sync v0.14.0
6868
google.golang.org/api v0.211.0
6969
gotest.tools v2.2.0+incompatible
7070
helm.sh/helm/v3 v3.17.3
@@ -73,7 +73,7 @@ require (
7373
k8s.io/client-go v0.33.0
7474
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
7575
oras.land/oras-go/v2 v2.5.0
76-
sigs.k8s.io/controller-runtime v0.20.4
76+
sigs.k8s.io/controller-runtime v0.21.0
7777
sigs.k8s.io/yaml v1.4.0
7878
)
7979

@@ -159,7 +159,7 @@ require (
159159
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
160160
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
161161
github.com/containerd/containerd v1.7.24 // indirect
162-
github.com/containerd/continuity v0.4.3 // indirect
162+
github.com/containerd/continuity v0.4.5 // indirect
163163
github.com/containerd/errdefs v0.3.0 // indirect
164164
github.com/containerd/log v0.1.0 // indirect
165165
github.com/containerd/platforms v0.2.1 // indirect
@@ -174,8 +174,8 @@ require (
174174
github.com/dimchansky/utfbom v1.1.1 // indirect
175175
github.com/distribution/reference v0.6.0 // indirect
176176
github.com/docker/distribution v2.8.3+incompatible // indirect
177-
github.com/docker/docker v27.5.0+incompatible // indirect
178-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
177+
github.com/docker/docker v28.1.1+incompatible // indirect
178+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
179179
github.com/docker/go-connections v0.5.0 // indirect
180180
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
181181
github.com/docker/go-metrics v0.0.1 // indirect
@@ -302,6 +302,7 @@ require (
302302
github.com/pborman/uuid v1.2.1 // indirect
303303
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
304304
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
305+
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
305306
github.com/pjbgf/sha1cd v0.3.2 // indirect
306307
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
307308
github.com/pkg/errors v0.9.1 // indirect
@@ -340,10 +341,11 @@ require (
340341
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
341342
github.com/thales-e-security/pool v0.0.2 // indirect
342343
github.com/theupdateframework/go-tuf v0.7.0 // indirect
344+
github.com/tinylib/msgp v1.3.0 // indirect
343345
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
344346
github.com/tjfoc/gmsm v1.4.1 // indirect
345347
github.com/transparency-dev/merkle v0.0.2 // indirect
346-
github.com/vbatts/tar-split v0.11.6 // indirect
348+
github.com/vbatts/tar-split v0.12.1 // indirect
347349
github.com/veraison/go-cose v1.3.0 // indirect
348350
github.com/x448/float16 v0.8.4 // indirect
349351
github.com/xanzy/go-gitlab v0.109.0 // indirect
@@ -361,8 +363,8 @@ require (
361363
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
362364
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
363365
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
364-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
365-
go.opentelemetry.io/otel v1.34.0 // indirect
366+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
367+
go.opentelemetry.io/otel v1.35.0 // indirect
366368
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
367369
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
368370
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
@@ -375,23 +377,23 @@ require (
375377
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
376378
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
377379
go.opentelemetry.io/otel/log v0.8.0 // indirect
378-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
379-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
380+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
381+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
380382
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
381-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
382-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
383+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
384+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
383385
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
384386
go.step.sm/crypto v0.51.2 // indirect
385387
go.uber.org/multierr v1.11.0 // indirect
386388
go.uber.org/zap v1.27.0 // indirect
387389
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
388390
golang.org/x/mod v0.24.0 // indirect
389-
golang.org/x/net v0.39.0 // indirect
390-
golang.org/x/sys v0.32.0 // indirect
391-
golang.org/x/term v0.31.0 // indirect
392-
golang.org/x/text v0.24.0 // indirect
391+
golang.org/x/net v0.40.0 // indirect
392+
golang.org/x/sys v0.33.0 // indirect
393+
golang.org/x/term v0.32.0 // indirect
394+
golang.org/x/text v0.25.0 // indirect
393395
golang.org/x/time v0.11.0 // indirect
394-
golang.org/x/tools v0.32.0 // indirect
396+
golang.org/x/tools v0.33.0 // indirect
395397
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
396398
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
397399
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect

0 commit comments

Comments
 (0)