Skip to content

Commit 9d9647c

Browse files
authored
Merge pull request #3 from kwok-ci/dump/k8s
Bump k8s to 1.35
2 parents 0a7541c + 63fda3a commit 9d9647c

23 files changed

+5028
-136
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
generate: \
44
pkg/wellknown/resources.go \
55
pkg/scheme/scheme.go \
6-
pkg/old/scheme/scheme.go \
7-
pkg/old/api
6+
pkg/old/api \
7+
pkg/old/scheme/scheme.go
88

99
pkg/scheme/scheme.go: ./hack/gen_scheme.sh go.mod
1010
go mod vendor
1111
-rm ./pkg/scheme/scheme.go
1212
./hack/gen_scheme.sh > ./pkg/scheme/scheme.go
1313

1414
pkg/old/api:
15-
./hack/clone_old_apis.sh 33
15+
./hack/clone_old_apis.sh 35
1616

1717
pkg/old/scheme/scheme.go: ./hack/gen_old_scheme.sh pkg/old/apis go.mod
1818
-rm ./pkg/old/scheme/scheme.go
1919
./hack/gen_old_scheme.sh > ./pkg/old/scheme/scheme.go
2020

2121
pkg/wellknown/resources.go: ./hack/gen_wellknown_resources go.mod
2222
-kwokctl delete cluster --name kectl-wellknown
23-
KWOK_KUBE_VERSION=1.33.0 kwokctl create cluster --name kectl-wellknown \
23+
KWOK_KUBE_VERSION=1.35.0 kwokctl create cluster --name kectl-wellknown \
2424
--kube-apiserver-insecure-port 8080 \
2525
--runtime binary \
2626
--disable-kube-controller-manager \

go.mod

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,84 @@
11
module github.com/kwok-ci/kectl
22

3-
go 1.24.2
3+
go 1.25.0
44

55
require (
66
github.com/bgentry/speakeasy v0.2.0
77
github.com/gogo/protobuf v1.3.2
88
github.com/google/go-cmp v0.7.0
9-
github.com/spf13/cobra v1.8.1
9+
github.com/spf13/cobra v1.10.0
1010
github.com/wzshiming/getch v0.0.0-20201023133301-8e758c21cf27
11-
go.etcd.io/etcd/api/v3 v3.5.21
12-
go.etcd.io/etcd/client/pkg/v3 v3.5.21
13-
go.etcd.io/etcd/client/v3 v3.5.21
14-
golang.org/x/term v0.30.0
15-
k8s.io/api v0.33.0
16-
k8s.io/apimachinery v0.33.0
17-
k8s.io/client-go v0.33.0
18-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
11+
go.etcd.io/etcd/api/v3 v3.6.7
12+
go.etcd.io/etcd/client/pkg/v3 v3.6.7
13+
go.etcd.io/etcd/client/v3 v3.6.7
14+
golang.org/x/term v0.37.0
15+
k8s.io/api v0.35.0
16+
k8s.io/apimachinery v0.35.0
17+
k8s.io/client-go v0.35.0
18+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
1919
sigs.k8s.io/e2e-framework v0.6.0
20-
sigs.k8s.io/yaml v1.4.0
20+
sigs.k8s.io/yaml v1.6.0
2121
)
2222

2323
require (
2424
github.com/beorn7/perks v1.0.1 // indirect
2525
github.com/blang/semver/v4 v4.0.0 // indirect
2626
github.com/cespare/xxhash/v2 v2.3.0 // indirect
27-
github.com/coreos/go-semver v0.3.0 // indirect
28-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
27+
github.com/coreos/go-semver v0.3.1 // indirect
28+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2929
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
30-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
30+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3131
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
32-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
33-
github.com/go-logr/logr v1.4.2 // indirect
32+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
33+
github.com/go-logr/logr v1.4.3 // indirect
3434
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3535
github.com/go-openapi/jsonreference v0.20.2 // indirect
3636
github.com/go-openapi/swag v0.23.0 // indirect
3737
github.com/golang/protobuf v1.5.4 // indirect
38-
github.com/google/gnostic-models v0.6.9 // indirect
38+
github.com/google/gnostic-models v0.7.0 // indirect
3939
github.com/google/uuid v1.6.0 // indirect
4040
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
41+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
4142
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4243
github.com/josharian/intern v1.0.0 // indirect
4344
github.com/json-iterator/go v1.1.12 // indirect
4445
github.com/mailru/easyjson v0.7.7 // indirect
4546
github.com/moby/spdystream v0.5.0 // indirect
4647
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
47-
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4849
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4950
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5051
github.com/pkg/errors v0.9.1 // indirect
51-
github.com/prometheus/client_golang v1.19.1 // indirect
52-
github.com/prometheus/client_model v0.6.1 // indirect
53-
github.com/prometheus/common v0.55.0 // indirect
54-
github.com/prometheus/procfs v0.15.1 // indirect
55-
github.com/spf13/pflag v1.0.5 // indirect
52+
github.com/prometheus/client_golang v1.23.2 // indirect
53+
github.com/prometheus/client_model v0.6.2 // indirect
54+
github.com/prometheus/common v0.66.1 // indirect
55+
github.com/prometheus/procfs v0.16.1 // indirect
56+
github.com/spf13/pflag v1.0.9 // indirect
5657
github.com/vladimirvivien/gexe v0.4.1 // indirect
5758
github.com/x448/float16 v0.8.4 // indirect
58-
go.opentelemetry.io/otel v1.28.0 // indirect
59-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
59+
go.opentelemetry.io/otel v1.36.0 // indirect
60+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
6061
go.uber.org/multierr v1.11.0 // indirect
6162
go.uber.org/zap v1.27.0 // indirect
62-
golang.org/x/net v0.38.0 // indirect
63-
golang.org/x/oauth2 v0.27.0 // indirect
64-
golang.org/x/sys v0.31.0 // indirect
65-
golang.org/x/text v0.23.0 // indirect
63+
go.yaml.in/yaml/v2 v2.4.3 // indirect
64+
go.yaml.in/yaml/v3 v3.0.4 // indirect
65+
golang.org/x/net v0.47.0 // indirect
66+
golang.org/x/oauth2 v0.30.0 // indirect
67+
golang.org/x/sys v0.38.0 // indirect
68+
golang.org/x/text v0.31.0 // indirect
6669
golang.org/x/time v0.9.0 // indirect
67-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
68-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
69-
google.golang.org/grpc v1.65.0 // indirect
70-
google.golang.org/protobuf v1.36.5 // indirect
71-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
70+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
71+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
72+
google.golang.org/grpc v1.72.2 // indirect
73+
google.golang.org/protobuf v1.36.8 // indirect
74+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7275
gopkg.in/inf.v0 v0.9.1 // indirect
7376
gopkg.in/yaml.v3 v3.0.1 // indirect
74-
k8s.io/component-base v0.32.1 // indirect
77+
k8s.io/component-base v0.35.0 // indirect
7578
k8s.io/klog/v2 v2.130.1 // indirect
76-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
79+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
7780
sigs.k8s.io/controller-runtime v0.20.0 // indirect
78-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
81+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
7982
sigs.k8s.io/randfill v1.0.0 // indirect
80-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
83+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
8184
)

0 commit comments

Comments
 (0)