Skip to content

Commit e65fb60

Browse files
authored
Merge pull request #3050 from wojtek-t/bump_clusterloader_deps
Bump clusterloader deps
2 parents f204d38 + abf58be commit e65fb60

File tree

8 files changed

+124
-131
lines changed

8 files changed

+124
-131
lines changed

clusterloader2/cmd/clusterloader.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ func validateClusterFlags() *errors.ErrorList {
124124
}
125125

126126
func initFlags() {
127+
flags.InitFlagSet()
128+
127129
flags.StringVar(&clusterLoaderConfig.ReportDir, "report-dir", "", "Path to the directory where the reports should be saved. Default is empty, which cause reports being written to standard output.")
128130
// TODO(https://github.com/kubernetes/perf-tests/issues/641): Remove testconfig and testoverrides flags when test suite is fully supported.
129131
flags.StringArrayVar(&testConfigPaths, "testconfig", []string{}, "Paths to the test config files")

clusterloader2/go.mod

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
module k8s.io/perf-tests/clusterloader2
22

33
// go 1.15+ is required by k8s 1.20 we use as dependency.
4-
go 1.22.4
4+
go 1.22.6
55

66
replace (
7-
k8s.io/api => k8s.io/api v0.29.7
8-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.7
9-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.7
10-
k8s.io/apiserver => k8s.io/apiserver v0.29.7
11-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.7
12-
k8s.io/client-go => k8s.io/client-go v0.29.7
13-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.7
14-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.7
15-
k8s.io/code-generator => k8s.io/code-generator v0.29.7
16-
k8s.io/component-base => k8s.io/component-base v0.29.7
17-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.7
18-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.7
19-
k8s.io/cri-api => k8s.io/cri-api v0.29.7
20-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.7
21-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.7
22-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.7
23-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.7
24-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.7
25-
k8s.io/kubectl => k8s.io/kubectl v0.29.7
26-
k8s.io/kubelet => k8s.io/kubelet v0.29.7
27-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.7
28-
k8s.io/metrics => k8s.io/metrics v0.29.7
29-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.7
30-
k8s.io/node-api => k8s.io/node-api v0.29.7
31-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7
32-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7
33-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.7
34-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.7
7+
k8s.io/api => k8s.io/api v0.30.4
8+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
9+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
10+
k8s.io/apiserver => k8s.io/apiserver v0.30.4
11+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
12+
k8s.io/client-go => k8s.io/client-go v0.30.4
13+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
14+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
15+
k8s.io/code-generator => k8s.io/code-generator v0.30.4
16+
k8s.io/component-base => k8s.io/component-base v0.30.4
17+
k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
18+
k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
19+
k8s.io/cri-api => k8s.io/cri-api v0.30.4
20+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
21+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
22+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
23+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
24+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
25+
k8s.io/kubectl => k8s.io/kubectl v0.30.4
26+
k8s.io/kubelet => k8s.io/kubelet v0.30.4
27+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
28+
k8s.io/metrics => k8s.io/metrics v0.30.4
29+
k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
30+
k8s.io/node-api => k8s.io/node-api v0.30.4
31+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
32+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
33+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.4
34+
k8s.io/sample-controller => k8s.io/sample-controller v0.30.4
3535
)
3636

3737
require (
@@ -51,16 +51,15 @@ require (
5151
golang.org/x/sync v0.10.0
5252
golang.org/x/time v0.8.0
5353
gopkg.in/yaml.v2 v2.4.0
54-
k8s.io/api v0.29.7
55-
k8s.io/apimachinery v0.29.7
56-
k8s.io/client-go v0.29.7
57-
k8s.io/component-base v0.29.7
58-
k8s.io/component-helpers v0.29.7
54+
k8s.io/api v0.30.4
55+
k8s.io/apimachinery v0.30.4
56+
k8s.io/client-go v0.30.4
57+
k8s.io/component-base v0.30.4
58+
k8s.io/component-helpers v0.30.4
5959
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
60-
k8s.io/klog v1.0.0
6160
k8s.io/klog/v2 v2.130.1
62-
k8s.io/kubelet v0.29.7
63-
k8s.io/kubernetes v1.29.7
61+
k8s.io/kubelet v0.30.4
62+
k8s.io/kubernetes v1.30.4
6463
)
6564

6665
require (
@@ -96,7 +95,7 @@ require (
9695
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9796
github.com/golang/protobuf v1.5.4 // indirect
9897
github.com/golang/snappy v0.0.4 // indirect
99-
github.com/google/cel-go v0.17.7 // indirect
98+
github.com/google/cel-go v0.17.8 // indirect
10099
github.com/google/gnostic-models v0.6.8 // indirect
101100
github.com/google/gofuzz v1.2.0 // indirect
102101
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
@@ -117,8 +116,8 @@ require (
117116
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
118117
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
119118
github.com/oklog/ulid v1.3.1 // indirect
120-
github.com/onsi/ginkgo/v2 v2.13.0 // indirect
121-
github.com/onsi/gomega v1.29.0 // indirect
119+
github.com/onsi/ginkgo/v2 v2.15.0 // indirect
120+
github.com/onsi/gomega v1.31.0 // indirect
122121
github.com/opencontainers/go-digest v1.0.0 // indirect
123122
github.com/opentracing/opentracing-go v1.2.0 // indirect
124123
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -143,9 +142,9 @@ require (
143142
go.opentelemetry.io/otel/trace v1.19.0 // indirect
144143
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
145144
go.uber.org/atomic v1.10.0 // indirect
146-
go.uber.org/goleak v1.2.1 // indirect
145+
go.uber.org/goleak v1.3.0 // indirect
147146
go.uber.org/multierr v1.11.0 // indirect
148-
go.uber.org/zap v1.19.0 // indirect
147+
go.uber.org/zap v1.26.0 // indirect
149148
golang.org/x/crypto v0.30.0 // indirect
150149
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
151150
golang.org/x/net v0.32.0 // indirect
@@ -162,15 +161,15 @@ require (
162161
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
163162
gopkg.in/yaml.v3 v3.0.1 // indirect
164163
k8s.io/apiextensions-apiserver v0.0.0 // indirect
165-
k8s.io/apiserver v0.29.7 // indirect
164+
k8s.io/apiserver v0.30.4 // indirect
166165
k8s.io/cloud-provider v0.0.0 // indirect
167-
k8s.io/controller-manager v0.29.7 // indirect
168-
k8s.io/kms v0.29.7 // indirect
169-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
166+
k8s.io/controller-manager v0.30.4 // indirect
167+
k8s.io/kms v0.30.4 // indirect
168+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
170169
k8s.io/kubectl v0.0.0 // indirect
171170
k8s.io/pod-security-admission v0.0.0 // indirect
172171
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
173-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
172+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
174173
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
175174
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
176175
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)