Skip to content

Commit 054bc84

Browse files
matthchrmatthchr
authored
Update dependencies (#4233)
1 parent 97ce00c commit 054bc84

File tree

11 files changed

+262
-221
lines changed

11 files changed

+262
-221
lines changed

‎v2/cmd/asoctl/go.mod‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ replace github.com/Azure/azure-service-operator/v2 => ../../
99
replace github.com/Azure/azure-service-operator/v2/tools/generator => ../generator
1010

1111
require (
12-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0
12+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
1313
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
14-
github.com/Azure/azure-service-operator/v2 v2.7.0
14+
github.com/Azure/azure-service-operator/v2 v2.9.0
1515
github.com/go-logr/logr v1.4.2
1616
github.com/go-logr/zerologr v1.2.3
1717
github.com/onsi/gomega v1.34.1
1818
github.com/pkg/errors v0.9.1
1919
github.com/rs/zerolog v1.33.0
2020
github.com/spf13/cobra v1.8.1
21-
github.com/vbauerster/mpb/v8 v8.7.3
22-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
23-
k8s.io/api v0.30.3
24-
k8s.io/apiextensions-apiserver v0.30.3
25-
k8s.io/apimachinery v0.30.3
26-
k8s.io/client-go v0.30.3
27-
sigs.k8s.io/controller-runtime v0.18.4
21+
github.com/vbauerster/mpb/v8 v8.8.3
22+
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
23+
k8s.io/api v0.31.0
24+
k8s.io/apiextensions-apiserver v0.31.0
25+
k8s.io/apimachinery v0.31.0
26+
k8s.io/client-go v0.31.0
27+
sigs.k8s.io/controller-runtime v0.19.0
2828
sigs.k8s.io/yaml v1.4.0
2929
)
3030

@@ -54,11 +54,11 @@ require (
5454
github.com/benbjohnson/clock v1.3.5 // indirect
5555
github.com/beorn7/perks v1.0.1 // indirect
5656
github.com/cespare/xxhash/v2 v2.3.0 // indirect
57-
github.com/davecgh/go-spew v1.1.1 // indirect
57+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5858
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
59-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
6059
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6160
github.com/fsnotify/fsnotify v1.7.0 // indirect
61+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6262
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6363
github.com/go-openapi/jsonreference v0.21.0 // indirect
6464
github.com/go-openapi/swag v0.23.0 // indirect
@@ -82,38 +82,41 @@ require (
8282
github.com/jackc/puddle/v2 v2.2.1 // indirect
8383
github.com/josharian/intern v1.0.0 // indirect
8484
github.com/json-iterator/go v1.1.12 // indirect
85+
github.com/klauspost/compress v1.17.9 // indirect
8586
github.com/kylelemons/godebug v1.1.0 // indirect
8687
github.com/mailru/easyjson v0.7.7 // indirect
8788
github.com/mattn/go-colorable v0.1.13 // indirect
8889
github.com/mattn/go-isatty v0.0.20 // indirect
89-
github.com/mattn/go-runewidth v0.0.15 // indirect
90+
github.com/mattn/go-runewidth v0.0.16 // indirect
9091
github.com/microsoft/go-mssqldb v1.7.2 // indirect
9192
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9293
github.com/modern-go/reflect2 v1.0.2 // indirect
9394
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9495
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
95-
github.com/prometheus/client_golang v1.19.1 // indirect
96+
github.com/prometheus/client_golang v1.20.2 // indirect
9697
github.com/prometheus/client_model v0.6.1 // indirect
97-
github.com/prometheus/common v0.54.0 // indirect
98+
github.com/prometheus/common v0.55.0 // indirect
9899
github.com/prometheus/procfs v0.15.1 // indirect
99100
github.com/rivo/uniseg v0.4.7 // indirect
100101
github.com/spf13/pflag v1.0.5 // indirect
101-
golang.org/x/crypto v0.25.0 // indirect
102-
golang.org/x/net v0.27.0 // indirect
103-
golang.org/x/oauth2 v0.21.0 // indirect
102+
github.com/x448/float16 v0.8.4 // indirect
103+
golang.org/x/crypto v0.26.0 // indirect
104+
golang.org/x/net v0.28.0 // indirect
105+
golang.org/x/oauth2 v0.22.0 // indirect
104106
golang.org/x/sync v0.8.0 // indirect
105-
golang.org/x/sys v0.22.0 // indirect
106-
golang.org/x/term v0.22.0 // indirect
107-
golang.org/x/text v0.16.0 // indirect
107+
golang.org/x/sys v0.24.0 // indirect
108+
golang.org/x/term v0.23.0 // indirect
109+
golang.org/x/text v0.17.0 // indirect
108110
golang.org/x/time v0.6.0 // indirect
109111
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
110112
google.golang.org/protobuf v1.34.2 // indirect
113+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
111114
gopkg.in/inf.v0 v0.9.1 // indirect
112115
gopkg.in/yaml.v2 v2.4.0 // indirect
113116
gopkg.in/yaml.v3 v3.0.1 // indirect
114117
k8s.io/klog/v2 v2.130.1 // indirect
115-
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
116-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
118+
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
119+
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
117120
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
118121
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
119122
)

‎v2/cmd/asoctl/go.sum‎

Lines changed: 56 additions & 47 deletions
Large diffs are not rendered by default.

‎v2/cmd/controller/app/setup.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,11 @@ func initializeWatchers(readyResources map[string]apiextensions.CustomResourceDe
377377
}
378378

379379
func makeControllerOptions(log logr.Logger, cfg config.Values) generic.Options {
380-
var additionalRateLimiters []workqueue.RateLimiter
380+
var additionalRateLimiters []workqueue.TypedRateLimiter[reconcile.Request]
381381
if cfg.RateLimit.Mode == config.RateLimitModeBucket {
382382
additionalRateLimiters = append(
383383
additionalRateLimiters,
384-
&workqueue.BucketRateLimiter{
384+
&workqueue.TypedBucketRateLimiter[reconcile.Request]{
385385
Limiter: rate.NewLimiter(rate.Limit(cfg.RateLimit.QPS), cfg.RateLimit.BucketSize),
386386
})
387387
}

‎v2/go.mod‎

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
toolchain go1.22.1
66

77
require (
8-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0
8+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
99
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement v1.1.1
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appconfiguration/armappconfiguration v1.1.1
@@ -38,38 +38,40 @@ require (
3838
github.com/microsoft/go-mssqldb v1.7.2
3939
github.com/onsi/gomega v1.34.1
4040
github.com/pkg/errors v0.9.1
41-
github.com/prometheus/client_golang v1.19.1
41+
github.com/prometheus/client_golang v1.20.2
4242
github.com/spf13/cobra v1.8.1
43-
golang.org/x/crypto v0.25.0
44-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
43+
golang.org/x/crypto v0.26.0
44+
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
4545
golang.org/x/sync v0.8.0
4646
golang.org/x/time v0.6.0
4747
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
4848
gopkg.in/yaml.v2 v2.4.0
49-
k8s.io/api v0.30.3
50-
k8s.io/apiextensions-apiserver v0.30.3
51-
k8s.io/apimachinery v0.30.3
52-
k8s.io/client-go v0.30.3
49+
k8s.io/api v0.31.0
50+
k8s.io/apiextensions-apiserver v0.31.0
51+
k8s.io/apimachinery v0.31.0
52+
k8s.io/client-go v0.31.0
5353
k8s.io/klog/v2 v2.130.1
54-
sigs.k8s.io/controller-runtime v0.18.4
54+
sigs.k8s.io/controller-runtime v0.19.0
5555
sigs.k8s.io/yaml v1.4.0
5656
)
5757

5858
require (
5959
filippo.io/edwards25519 v1.1.0 // indirect
6060
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
6161
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
62-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
62+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
63+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6364
github.com/beorn7/perks v1.0.1 // indirect
6465
github.com/blang/semver/v4 v4.0.0 // indirect
6566
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6667
github.com/cespare/xxhash/v2 v2.3.0 // indirect
67-
github.com/davecgh/go-spew v1.1.1 // indirect
68+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6869
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6970
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
7071
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
7172
github.com/felixge/httpsnoop v1.0.4 // indirect
7273
github.com/fsnotify/fsnotify v1.7.0 // indirect
74+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7375
github.com/go-logr/stdr v1.2.2 // indirect
7476
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7577
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -80,61 +82,57 @@ require (
8082
github.com/golang-sql/sqlexp v0.1.0 // indirect
8183
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8284
github.com/golang/protobuf v1.5.4 // indirect
83-
github.com/google/cel-go v0.20.1 // indirect
85+
github.com/google/cel-go v0.21.0 // indirect
8486
github.com/google/gnostic-models v0.6.8 // indirect
8587
github.com/google/gofuzz v1.2.0 // indirect
86-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
88+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
8789
github.com/imdario/mergo v0.3.16 // indirect
8890
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8991
github.com/jackc/pgpassfile v1.0.0 // indirect
9092
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
9193
github.com/jackc/puddle/v2 v2.2.1 // indirect
9294
github.com/josharian/intern v1.0.0 // indirect
9395
github.com/json-iterator/go v1.1.12 // indirect
96+
github.com/klauspost/compress v1.17.9 // indirect
9497
github.com/kr/text v0.2.0 // indirect
9598
github.com/mailru/easyjson v0.7.7 // indirect
9699
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
97100
github.com/modern-go/reflect2 v1.0.2 // indirect
98101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
99102
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
100103
github.com/prometheus/client_model v0.6.1 // indirect
101-
github.com/prometheus/common v0.54.0 // indirect
104+
github.com/prometheus/common v0.55.0 // indirect
102105
github.com/prometheus/procfs v0.15.1 // indirect
103106
github.com/rogpeppe/go-internal v1.12.0 // indirect
104107
github.com/spf13/pflag v1.0.5 // indirect
105108
github.com/stoewer/go-strcase v1.3.0 // indirect
106-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
107-
go.opentelemetry.io/otel v1.27.0 // indirect
108-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
109-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
110-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
111-
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
112-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
109+
github.com/x448/float16 v0.8.4 // indirect
110+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
111+
go.opentelemetry.io/otel v1.29.0 // indirect
112+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
113+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 // indirect
114+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
115+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
116+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
113117
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
114-
golang.org/x/net v0.27.0 // indirect
115-
golang.org/x/oauth2 v0.21.0 // indirect
116-
golang.org/x/sys v0.22.0 // indirect
117-
golang.org/x/term v0.22.0 // indirect
118-
golang.org/x/text v0.16.0 // indirect
118+
golang.org/x/net v0.28.0 // indirect
119+
golang.org/x/oauth2 v0.22.0 // indirect
120+
golang.org/x/sys v0.24.0 // indirect
121+
golang.org/x/term v0.23.0 // indirect
122+
golang.org/x/text v0.17.0 // indirect
119123
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
120-
google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect
121-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3 // indirect
122-
google.golang.org/grpc v1.64.1 // indirect
124+
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
125+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
126+
google.golang.org/grpc v1.65.0 // indirect
123127
google.golang.org/protobuf v1.34.2 // indirect
128+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
124129
gopkg.in/inf.v0 v0.9.1 // indirect
125130
gopkg.in/yaml.v3 v3.0.1 // indirect
126-
k8s.io/apiserver v0.30.3 // indirect
127-
k8s.io/component-base v0.30.3 // indirect
128-
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
129-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
131+
k8s.io/apiserver v0.31.0 // indirect
132+
k8s.io/component-base v0.31.0 // indirect
133+
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
134+
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
130135
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
131136
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
132137
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
133138
)
134-
135-
// Without this, k8s-apiserver seems not to build...
136-
// /go/pkg/mod/k8s.io/[email protected]/pkg/cel/library/cost.go:412:11: cannot use &itemsNode{…} (value of type *itemsNode) as checker.AstNode value in return statement: *itemsNode does not implement checker.AstNode (wrong type for method Expr)
137-
// [controller:test] have Expr() *expr.Expr
138-
// [controller:test] want Expr() "github.com/google/cel-go/common/ast".Expr
139-
// This is due to https://github.com/google/cel-go/releases/tag/v0.18.0 breaking change I think.
140-
replace github.com/google/cel-go => github.com/google/cel-go v0.17.8

0 commit comments

Comments
 (0)