Skip to content

Commit f5949d8

Browse files
authored
Merge pull request #39 from kcp-dev/1.31-prep
✨ Rebase 1.31
2 parents bf1c9b8 + 4f096cf commit f5949d8

File tree

80 files changed

+3559
-2301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+3559
-2301
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GOBIN_DIR=$(abspath ./bin )
2323
PATH := $(GOBIN_DIR):$(TOOLS_GOBIN_DIR):$(PATH)
2424
TMPDIR := $(shell mktemp -d)
2525

26-
CODE_GENERATOR_VER := v2.2.0
26+
CODE_GENERATOR_VER := v2.3.0
2727
CODE_GENERATOR_BIN := code-generator
2828
CODE_GENERATOR := $(TOOLS_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER)
2929
export CODE_GENERATOR # so hack scripts can use it

go.mod

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,82 +5,85 @@ go 1.22.0
55
require (
66
github.com/evanphx/json-patch v5.6.0+incompatible
77
github.com/google/gnostic-models v0.6.8
8-
github.com/kcp-dev/apimachinery/v2 v2.0.0
8+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb
99
github.com/kcp-dev/logicalcluster/v3 v3.0.4
10-
k8s.io/api v0.30.0
11-
k8s.io/apiextensions-apiserver v0.30.0
12-
k8s.io/apimachinery v0.30.0
13-
k8s.io/client-go v0.30.0
14-
k8s.io/klog/v2 v2.120.1
10+
k8s.io/api v0.31.0
11+
k8s.io/apiextensions-apiserver v0.31.0
12+
k8s.io/apimachinery v0.31.0
13+
k8s.io/client-go v0.31.0
14+
k8s.io/klog/v2 v2.130.1
1515
)
1616

1717
require (
18-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
18+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
1919
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2020
github.com/beorn7/perks v1.0.1 // indirect
2121
github.com/blang/semver/v4 v4.0.0 // indirect
22-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24-
github.com/davecgh/go-spew v1.1.1 // indirect
22+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26-
github.com/felixge/httpsnoop v1.0.3 // indirect
27-
github.com/go-logr/logr v1.4.1 // indirect
26+
github.com/felixge/httpsnoop v1.0.4 // indirect
27+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28+
github.com/go-logr/logr v1.4.2 // indirect
2829
github.com/go-logr/stdr v1.2.2 // indirect
2930
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3031
github.com/go-openapi/jsonreference v0.20.2 // indirect
31-
github.com/go-openapi/swag v0.22.3 // indirect
32+
github.com/go-openapi/swag v0.22.4 // indirect
3233
github.com/gogo/protobuf v1.3.2 // indirect
3334
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/cel-go v0.17.8 // indirect
35+
github.com/google/cel-go v0.20.1 // indirect
3536
github.com/google/go-cmp v0.6.0 // indirect
3637
github.com/google/gofuzz v1.2.0 // indirect
37-
github.com/google/uuid v1.3.0 // indirect
38-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
39+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
3940
github.com/imdario/mergo v0.3.6 // indirect
41+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4042
github.com/josharian/intern v1.0.0 // indirect
4143
github.com/json-iterator/go v1.1.12 // indirect
4244
github.com/mailru/easyjson v0.7.7 // indirect
43-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4445
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4546
github.com/modern-go/reflect2 v1.0.2 // indirect
4647
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4748
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/prometheus/client_golang v1.16.0 // indirect
49-
github.com/prometheus/client_model v0.4.0 // indirect
50-
github.com/prometheus/common v0.44.0 // indirect
51-
github.com/prometheus/procfs v0.10.1 // indirect
49+
github.com/prometheus/client_golang v1.19.1 // indirect
50+
github.com/prometheus/client_model v0.6.1 // indirect
51+
github.com/prometheus/common v0.55.0 // indirect
52+
github.com/prometheus/procfs v0.15.1 // indirect
53+
github.com/spf13/cobra v1.8.1 // indirect
5254
github.com/spf13/pflag v1.0.5 // indirect
5355
github.com/stoewer/go-strcase v1.2.0 // indirect
54-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
55-
go.opentelemetry.io/otel v1.19.0 // indirect
56-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
57-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
58-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
59-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
60-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
61-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
62-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
63-
golang.org/x/net v0.23.0 // indirect
64-
golang.org/x/oauth2 v0.10.0 // indirect
65-
golang.org/x/sync v0.6.0 // indirect
66-
golang.org/x/sys v0.18.0 // indirect
67-
golang.org/x/term v0.18.0 // indirect
68-
golang.org/x/text v0.14.0 // indirect
56+
github.com/x448/float16 v0.8.4 // indirect
57+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
58+
go.opentelemetry.io/otel v1.28.0 // indirect
59+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
60+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
61+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
62+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
63+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
64+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
65+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
66+
golang.org/x/net v0.26.0 // indirect
67+
golang.org/x/oauth2 v0.21.0 // indirect
68+
golang.org/x/sync v0.7.0 // indirect
69+
golang.org/x/sys v0.21.0 // indirect
70+
golang.org/x/term v0.21.0 // indirect
71+
golang.org/x/text v0.16.0 // indirect
6972
golang.org/x/time v0.3.0 // indirect
70-
google.golang.org/appengine v1.6.7 // indirect
71-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
72-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
73-
google.golang.org/grpc v1.58.3 // indirect
74-
google.golang.org/protobuf v1.33.0 // indirect
73+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
74+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
75+
google.golang.org/grpc v1.65.0 // indirect
76+
google.golang.org/protobuf v1.34.2 // indirect
77+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7578
gopkg.in/inf.v0 v0.9.1 // indirect
7679
gopkg.in/yaml.v2 v2.4.0 // indirect
7780
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiserver v0.30.0 // indirect
79-
k8s.io/component-base v0.30.0 // indirect
81+
k8s.io/apiserver v0.31.0 // indirect
82+
k8s.io/component-base v0.31.0 // indirect
8083
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
81-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
82-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
84+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
85+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
8386
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8487
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
85-
sigs.k8s.io/yaml v1.3.0 // indirect
88+
sigs.k8s.io/yaml v1.4.0 // indirect
8689
)

0 commit comments

Comments
 (0)