Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump clusterloader deps #3088

Merged
merged 3 commits into from
Jan 14, 2025
Merged

Bump clusterloader deps #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96415ff
Bump clusterloader deps to 1.30
wojtek-t Jan 8, 2025
3687dc6
Fix failures of bumped dependencies
wojtek-t Jan 8, 2025
9986ddf
Fix missing flag registration
wojtek-t Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions clusterloader2/cmd/clusterloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,22 @@ func validateClusterFlags() *errors.ErrorList {
}

func initFlags() {
flags.InitFlagSet()

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.")
// TODO(https://github.com/kubernetes/perf-tests/issues/641): Remove testconfig and testoverrides flags when test suite is fully supported.
flags.StringArrayVar(&testConfigPaths, "testconfig", []string{}, "Paths to the test config files")
flags.StringArrayVar(&clusterLoaderConfig.OverridePaths, "testoverrides", []string{}, "Paths to the config overrides file. The latter overrides take precedence over changes in former files.")
flags.StringVar(&testSuiteConfigPath, "testsuite", "", "Path to the test suite config file")
flags.IntVar(&port, "port", 8000, "Port to be used by http server with pprof.")
flags.BoolVar(&dryRun, "dry-run", false, "Whether to skip running test and only compile test config")

initClusterFlags()
execservice.InitFlags(&clusterLoaderConfig.ExecServiceConfig)
imagepreload.InitFlags()
modifier.InitFlags(&clusterLoaderConfig.ModifierConfig)
prometheus.InitFlags(&clusterLoaderConfig.PrometheusConfig)
prometheus.InitExperimentalFlags()
}

func validateFlags() *errors.ErrorList {
Expand Down
86 changes: 43 additions & 43 deletions clusterloader2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@ module k8s.io/perf-tests/clusterloader2
go 1.23.4

replace (
k8s.io/api => k8s.io/api v0.29.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.7
k8s.io/apimachinery => k8s.io/apimachinery v0.29.7
k8s.io/apiserver => k8s.io/apiserver v0.29.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.7
k8s.io/client-go => k8s.io/client-go v0.29.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.7
k8s.io/code-generator => k8s.io/code-generator v0.29.7
k8s.io/component-base => k8s.io/component-base v0.29.7
k8s.io/component-helpers => k8s.io/component-helpers v0.29.7
k8s.io/controller-manager => k8s.io/controller-manager v0.29.7
k8s.io/cri-api => k8s.io/cri-api v0.29.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.7
k8s.io/kubectl => k8s.io/kubectl v0.29.7
k8s.io/kubelet => k8s.io/kubelet v0.29.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.7
k8s.io/metrics => k8s.io/metrics v0.29.7
k8s.io/mount-utils => k8s.io/mount-utils v0.29.7
k8s.io/node-api => k8s.io/node-api v0.29.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.7
k8s.io/sample-controller => k8s.io/sample-controller v0.29.7
k8s.io/api => k8s.io/api v0.30.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
k8s.io/apiserver => k8s.io/apiserver v0.30.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
k8s.io/client-go => k8s.io/client-go v0.30.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
k8s.io/code-generator => k8s.io/code-generator v0.30.4
k8s.io/component-base => k8s.io/component-base v0.30.4
k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
k8s.io/cri-api => k8s.io/cri-api v0.30.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
k8s.io/kubectl => k8s.io/kubectl v0.30.4
k8s.io/kubelet => k8s.io/kubelet v0.30.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
k8s.io/metrics => k8s.io/metrics v0.30.4
k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
k8s.io/node-api => k8s.io/node-api v0.30.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.4
k8s.io/sample-controller => k8s.io/sample-controller v0.30.4
)

require (
Expand All @@ -53,15 +53,15 @@ require (
golang.org/x/sync v0.10.0
golang.org/x/time v0.9.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.29.7
k8s.io/apimachinery v0.29.7
k8s.io/client-go v0.29.7
k8s.io/component-base v0.29.7
k8s.io/component-helpers v0.29.7
k8s.io/api v0.30.4
k8s.io/apimachinery v0.30.4
k8s.io/client-go v0.30.4
k8s.io/component-base v0.30.4
k8s.io/component-helpers v0.30.4
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
k8s.io/klog/v2 v2.130.1
k8s.io/kubelet v0.29.7
k8s.io/kubernetes v1.29.7
k8s.io/kubelet v0.30.4
k8s.io/kubernetes v1.30.4
)

require (
Expand Down Expand Up @@ -95,7 +95,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand Down Expand Up @@ -138,9 +138,9 @@ require (
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.2.1 // indirect
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.19.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0 // indirect
Expand All @@ -155,13 +155,13 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/apiserver v0.29.7 // indirect
k8s.io/apiserver v0.30.4 // indirect
k8s.io/cloud-provider v0.0.0 // indirect
k8s.io/controller-manager v0.29.7 // indirect
k8s.io/kms v0.29.7 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/controller-manager v0.30.4 // indirect
k8s.io/kms v0.30.4 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
Loading