github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #125993 from macsko/increase_server_timeout_in_scheduler_perf_tests

Browse Source 
Increase API server timeout in scheduler_perf integration tests
This commit is contained in:
Kubernetes Prow Robot 2024-07-16 08:15:10 -07:00 committed by GitHub
commit 5f7cfdef11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kube-apiserver/app/testing/testserver.go
View File

@ -104,6 +104,8 @@ type TestServerInstanceOptions struct {
// Set the BinaryVersion of server effective version. // Set the BinaryVersion of server effective version.
// Default to 1.31 // Default to 1.31
BinaryVersion string BinaryVersion string
// Set non-default request timeout in the server.
RequestTimeout time.Duration
} }
// TestServer return values supplied by kube-test-ApiServer // TestServer return values supplied by kube-test-ApiServer
@ -194,6 +196,9 @@ func StartTestServer(t ktesting.TB, instanceOptions *TestServerInstanceOptions,
utilruntime.Must(utilversion.DefaultComponentGlobalsRegistry.Register(utilversion.DefaultKubeComponent, effectiveVersion, featureGate)) utilruntime.Must(utilversion.DefaultComponentGlobalsRegistry.Register(utilversion.DefaultKubeComponent, effectiveVersion, featureGate))
s := options.NewServerRunOptions() s := options.NewServerRunOptions()
if instanceOptions.RequestTimeout > 0 {
s.GenericServerRunOptions.RequestTimeout = instanceOptions.RequestTimeout
}
for _, f := range s.Flags().FlagSets { for _, f := range s.Flags().FlagSets {
fs.AddFlagSet(f) fs.AddFlagSet(f)

5
test/integration/scheduler_perf/util.go
View File

@ -94,7 +94,10 @@ func mustSetupCluster(tCtx ktesting.TContext, config *config.KubeSchedulerConfig
"--disable-admission-plugins=ServiceAccount,TaintNodesByCondition,Priority", "--disable-admission-plugins=ServiceAccount,TaintNodesByCondition,Priority",
"--runtime-config=" + strings.Join(runtimeConfig, ","), "--runtime-config=" + strings.Join(runtimeConfig, ","),
} }
server, err := apiservertesting.StartTestServer(tCtx, apiservertesting.NewDefaultTestServerOptions(), customFlags, framework.SharedEtcd()) serverOpts := apiservertesting.NewDefaultTestServerOptions()
// Timeout sufficiently long to handle deleting pods of the largest test cases.
serverOpts.RequestTimeout = 10 * time.Minute
server, err := apiservertesting.StartTestServer(tCtx, serverOpts, customFlags, framework.SharedEtcd())
if err != nil { if err != nil {
tCtx.Fatalf("start apiserver: %v", err) tCtx.Fatalf("start apiserver: %v", err)
} }