Skip to content

Commit 865d08a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3088 from wojtek-t/bump_clusterloader_deps_2
Bump clusterloader deps
2 parents 0c86f9d + 9986ddf commit 865d08a

File tree

7 files changed

+116
-99
lines changed

7 files changed

+116
-99
lines changed

‎clusterloader2/cmd/clusterloader.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,22 @@ 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")
130132
flags.StringArrayVar(&clusterLoaderConfig.OverridePaths, "testoverrides", []string{}, "Paths to the config overrides file. The latter overrides take precedence over changes in former files.")
131133
flags.StringVar(&testSuiteConfigPath, "testsuite", "", "Path to the test suite config file")
132134
flags.IntVar(&port, "port", 8000, "Port to be used by http server with pprof.")
133135
flags.BoolVar(&dryRun, "dry-run", false, "Whether to skip running test and only compile test config")
136+
134137
initClusterFlags()
135138
execservice.InitFlags(&clusterLoaderConfig.ExecServiceConfig)
139+
imagepreload.InitFlags()
136140
modifier.InitFlags(&clusterLoaderConfig.ModifierConfig)
137141
prometheus.InitFlags(&clusterLoaderConfig.PrometheusConfig)
142+
prometheus.InitExperimentalFlags()
138143
}
139144

140145
func validateFlags() *errors.ErrorList {

‎clusterloader2/go.mod

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@ module k8s.io/perf-tests/clusterloader2
44
go 1.23.4
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 (
@@ -53,15 +53,15 @@ require (
5353
golang.org/x/sync v0.10.0
5454
golang.org/x/time v0.9.0
5555
gopkg.in/yaml.v2 v2.4.0
56-
k8s.io/api v0.29.7
57-
k8s.io/apimachinery v0.29.7
58-
k8s.io/client-go v0.29.7
59-
k8s.io/component-base v0.29.7
60-
k8s.io/component-helpers v0.29.7
56+
k8s.io/api v0.30.4
57+
k8s.io/apimachinery v0.30.4
58+
k8s.io/client-go v0.30.4
59+
k8s.io/component-base v0.30.4
60+
k8s.io/component-helpers v0.30.4
6161
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
6262
k8s.io/klog/v2 v2.130.1
63-
k8s.io/kubelet v0.29.7
64-
k8s.io/kubernetes v1.29.7
63+
k8s.io/kubelet v0.30.4
64+
k8s.io/kubernetes v1.30.4
6565
)
6666

6767
require (
@@ -95,7 +95,7 @@ require (
9595
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9696
github.com/golang/protobuf v1.5.4 // indirect
9797
github.com/golang/snappy v0.0.4 // indirect
98-
github.com/google/cel-go v0.17.7 // indirect
98+
github.com/google/cel-go v0.17.8 // indirect
9999
github.com/google/gnostic-models v0.6.8 // indirect
100100
github.com/google/gofuzz v1.2.0 // indirect
101101
github.com/google/uuid v1.6.0 // indirect
@@ -138,9 +138,9 @@ require (
138138
go.opentelemetry.io/otel/trace v1.19.0 // indirect
139139
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
140140
go.uber.org/atomic v1.10.0 // indirect
141-
go.uber.org/goleak v1.2.1 // indirect
141+
go.uber.org/goleak v1.3.0 // indirect
142142
go.uber.org/multierr v1.11.0 // indirect
143-
go.uber.org/zap v1.19.0 // indirect
143+
go.uber.org/zap v1.26.0 // indirect
144144
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
145145
golang.org/x/net v0.34.0 // indirect
146146
golang.org/x/sys v0.29.0 // indirect
@@ -155,13 +155,13 @@ require (
155155
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
156156
gopkg.in/yaml.v3 v3.0.1 // indirect
157157
k8s.io/apiextensions-apiserver v0.0.0 // indirect
158-
k8s.io/apiserver v0.29.7 // indirect
158+
k8s.io/apiserver v0.30.4 // indirect
159159
k8s.io/cloud-provider v0.0.0 // indirect
160-
k8s.io/controller-manager v0.29.7 // indirect
161-
k8s.io/kms v0.29.7 // indirect
162-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
160+
k8s.io/controller-manager v0.30.4 // indirect
161+
k8s.io/kms v0.30.4 // indirect
162+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
163163
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
164-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
164+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
165165
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
166166
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
167167
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)