Skip to content

Commit a5d77e9

Browse files
authored
Merge pull request #176 from gofed/k8s-1.29-rebase
bump(k8s)=v1.29.1
2 parents 55e426f + c6dc656 commit a5d77e9

File tree

1,292 files changed

+56866
-29879
lines changed

Some content is hidden

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

1,292 files changed

+56866
-29879
lines changed

go.mod

Lines changed: 80 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
module sigs.k8s.io/cluster-capacity
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.1
46

57
require (
68
github.com/lithammer/dedent v1.1.0
79
github.com/satori/go.uuid v1.2.0
810
github.com/spf13/cobra v1.7.0
911
github.com/spf13/pflag v1.0.5
10-
k8s.io/api v0.28.3
11-
k8s.io/apimachinery v0.28.3
12-
k8s.io/client-go v0.28.3
13-
k8s.io/component-base v0.28.3
14-
k8s.io/klog/v2 v2.100.1
15-
k8s.io/kube-scheduler v0.28.3
16-
k8s.io/kubernetes v1.28.3
12+
k8s.io/api v0.29.1
13+
k8s.io/apimachinery v0.29.1
14+
k8s.io/client-go v0.29.1
15+
k8s.io/component-base v0.29.1
16+
k8s.io/klog/v2 v2.110.1
17+
k8s.io/kube-scheduler v0.29.1
18+
k8s.io/kubernetes v1.29.1
1719
sigs.k8s.io/yaml v1.3.0
1820
)
1921

@@ -28,26 +30,26 @@ require (
2830
github.com/coreos/go-semver v0.3.1 // indirect
2931
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3032
github.com/davecgh/go-spew v1.1.1 // indirect
31-
github.com/docker/distribution v2.8.2+incompatible // indirect
32-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
33+
github.com/distribution/reference v0.5.0 // indirect
34+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3335
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3436
github.com/felixge/httpsnoop v1.0.3 // indirect
35-
github.com/fsnotify/fsnotify v1.6.0 // indirect
36-
github.com/go-logr/logr v1.2.4 // indirect
37+
github.com/fsnotify/fsnotify v1.7.0 // indirect
38+
github.com/go-logr/logr v1.3.0 // indirect
3739
github.com/go-logr/stdr v1.2.2 // indirect
3840
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3941
github.com/go-openapi/jsonreference v0.20.2 // indirect
4042
github.com/go-openapi/swag v0.22.3 // indirect
4143
github.com/gogo/protobuf v1.3.2 // indirect
4244
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4345
github.com/golang/protobuf v1.5.3 // indirect
44-
github.com/google/cel-go v0.16.1 // indirect
46+
github.com/google/cel-go v0.17.7 // indirect
4547
github.com/google/gnostic-models v0.6.8 // indirect
46-
github.com/google/go-cmp v0.5.9 // indirect
48+
github.com/google/go-cmp v0.6.0 // indirect
4749
github.com/google/gofuzz v1.2.0 // indirect
4850
github.com/google/uuid v1.3.0 // indirect
4951
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
50-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
52+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
5153
github.com/imdario/mergo v0.3.11 // indirect
5254
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5355
github.com/josharian/intern v1.0.0 // indirect
@@ -59,91 +61,90 @@ require (
5961
github.com/modern-go/reflect2 v1.0.2 // indirect
6062
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6163
github.com/opencontainers/go-digest v1.0.0 // indirect
62-
github.com/opencontainers/selinux v1.10.0 // indirect
64+
github.com/opencontainers/selinux v1.11.0 // indirect
6365
github.com/pkg/errors v0.9.1 // indirect
6466
github.com/prometheus/client_golang v1.16.0 // indirect
6567
github.com/prometheus/client_model v0.4.0 // indirect
6668
github.com/prometheus/common v0.44.0 // indirect
6769
github.com/prometheus/procfs v0.10.1 // indirect
6870
github.com/stoewer/go-strcase v1.2.0 // indirect
69-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
70-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
71-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
73-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
74-
go.opentelemetry.io/otel v1.10.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
76-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
77-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
78-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
79-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
80-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
81-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
71+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
72+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
73+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
75+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
76+
go.opentelemetry.io/otel v1.19.0 // indirect
77+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
79+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
80+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
81+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
82+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
8283
go.uber.org/atomic v1.10.0 // indirect
8384
go.uber.org/multierr v1.11.0 // indirect
8485
go.uber.org/zap v1.19.0 // indirect
85-
golang.org/x/crypto v0.14.0 // indirect
86+
golang.org/x/crypto v0.16.0 // indirect
8687
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
87-
golang.org/x/net v0.17.0 // indirect
88-
golang.org/x/oauth2 v0.8.0 // indirect
89-
golang.org/x/sync v0.2.0 // indirect
90-
golang.org/x/sys v0.13.0 // indirect
91-
golang.org/x/term v0.13.0 // indirect
92-
golang.org/x/text v0.13.0 // indirect
88+
golang.org/x/net v0.19.0 // indirect
89+
golang.org/x/oauth2 v0.10.0 // indirect
90+
golang.org/x/sync v0.5.0 // indirect
91+
golang.org/x/sys v0.15.0 // indirect
92+
golang.org/x/term v0.15.0 // indirect
93+
golang.org/x/text v0.14.0 // indirect
9394
golang.org/x/time v0.3.0 // indirect
9495
google.golang.org/appengine v1.6.7 // indirect
95-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
96-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
97-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
98-
google.golang.org/grpc v1.54.0 // indirect
99-
google.golang.org/protobuf v1.30.0 // indirect
96+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
99+
google.golang.org/grpc v1.58.3 // indirect
100+
google.golang.org/protobuf v1.31.0 // indirect
100101
gopkg.in/inf.v0 v0.9.1 // indirect
101102
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
102103
gopkg.in/yaml.v2 v2.4.0 // indirect
103104
gopkg.in/yaml.v3 v3.0.1 // indirect
104105
k8s.io/apiextensions-apiserver v0.0.0 // indirect
105-
k8s.io/apiserver v0.28.3 // indirect
106-
k8s.io/cloud-provider v0.28.3 // indirect
107-
k8s.io/component-helpers v0.28.3 // indirect
108-
k8s.io/controller-manager v0.28.3 // indirect
109-
k8s.io/csi-translation-lib v0.28.3 // indirect
106+
k8s.io/apiserver v0.29.1 // indirect
107+
k8s.io/cloud-provider v0.29.1 // indirect
108+
k8s.io/component-helpers v0.29.1 // indirect
109+
k8s.io/controller-manager v0.29.1 // indirect
110+
k8s.io/csi-translation-lib v0.29.1 // indirect
110111
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
111-
k8s.io/kms v0.28.3 // indirect
112-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
113-
k8s.io/kubelet v0.28.3 // indirect
114-
k8s.io/mount-utils v0.28.3 // indirect
115-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
116-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
112+
k8s.io/kms v0.29.1 // indirect
113+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
114+
k8s.io/kubelet v0.29.1 // indirect
115+
k8s.io/mount-utils v0.29.1 // indirect
116+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
117+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
117118
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
118-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
119+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
119120
)
120121

121122
replace (
122-
k8s.io/api => k8s.io/api v0.28.3
123-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.3
124-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
125-
k8s.io/apiserver => k8s.io/apiserver v0.28.3
126-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.3
127-
k8s.io/client-go => k8s.io/client-go v0.28.3
128-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.3
129-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.3
130-
k8s.io/code-generator => k8s.io/code-generator v0.28.3
131-
k8s.io/component-base => k8s.io/component-base v0.28.3
132-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.3
133-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.3
134-
k8s.io/cri-api => k8s.io/cri-api v0.28.3
135-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.3
136-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.3
137-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.3
138-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.3
139-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.3
140-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.3
141-
k8s.io/kubectl => k8s.io/kubectl v0.28.3
142-
k8s.io/kubelet => k8s.io/kubelet v0.28.3
143-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.3
144-
k8s.io/metrics => k8s.io/metrics v0.28.3
145-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.3
146-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.3
147-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.3
123+
k8s.io/api => k8s.io/api v0.29.1
124+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.1
125+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.1
126+
k8s.io/apiserver => k8s.io/apiserver v0.29.1
127+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.1
128+
k8s.io/client-go => k8s.io/client-go v0.29.1
129+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.1
130+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.1
131+
k8s.io/code-generator => k8s.io/code-generator v0.29.1
132+
k8s.io/component-base => k8s.io/component-base v0.29.1
133+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.1
134+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.1
135+
k8s.io/cri-api => k8s.io/cri-api v0.29.1
136+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.1
137+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.1
138+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.1
139+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.1
140+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.1
141+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.1
142+
k8s.io/kubectl => k8s.io/kubectl v0.29.1
143+
k8s.io/kubelet => k8s.io/kubelet v0.29.1
144+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.1
145+
k8s.io/metrics => k8s.io/metrics v0.29.1
146+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.1
147+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.1
148+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.1
148149
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2
149150
)

0 commit comments

Comments
 (0)