github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128498 from googs1025/flake/TestReconcilerAPIServerLeaseMultiCombined

Browse Source 
flake(TestReconcilerAPIServerLeaseMultiCombined): fix TestReconcilerAPIServerLeaseMultiCombined flake
This commit is contained in:
Kubernetes Prow Robot 2024-11-07 16:10:43 +00:00 committed by GitHub
commit a660b51201
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/controlplane/kube_apiserver_test.go
View File

@ -24,7 +24,6 @@ import (
"net/http" "net/http"
"reflect" "reflect"
"strings" "strings"
"sync"
"testing" "testing"
"time" "time"
@ -440,22 +439,16 @@ func testReconcilersAPIServerLease(t *testing.T, leaseCount int, apiServerCount
instanceOptions := kubeapiservertesting.NewDefaultTestServerOptions() instanceOptions := kubeapiservertesting.NewDefaultTestServerOptions()
wg := sync.WaitGroup{}
// 1. start apiServerCount api servers // 1. start apiServerCount api servers
for i := 0; i < apiServerCount; i++ { for i := 0; i < apiServerCount; i++ {
// start count api server // start count api server
wg.Add(1)
go func(i int) {
defer wg.Done()
server := kubeapiservertesting.StartTestServerOrDie(t, instanceOptions, []string{ server := kubeapiservertesting.StartTestServerOrDie(t, instanceOptions, []string{
"--endpoint-reconciler-type", "master-count", "--endpoint-reconciler-type", "master-count",
"--advertise-address", fmt.Sprintf("10.0.1.%v", i+1), "--advertise-address", fmt.Sprintf("10.0.1.%v", i+1),
"--apiserver-count", fmt.Sprintf("%v", apiServerCount), "--apiserver-count", fmt.Sprintf("%v", apiServerCount),
}, etcd) }, etcd)
apiServerCountServers[i] = server apiServerCountServers[i] = server
}(i)
} }
wg.Wait()
// 2. verify API Server count servers have registered // 2. verify API Server count servers have registered
if err := wait.PollImmediate(3*time.Second, 2*time.Minute, func() (bool, error) { if err := wait.PollImmediate(3*time.Second, 2*time.Minute, func() (bool, error) {
@ -476,18 +469,14 @@ func testReconcilersAPIServerLease(t *testing.T, leaseCount int, apiServerCount
// 3. start lease api servers // 3. start lease api servers
for i := 0; i < leaseCount; i++ { for i := 0; i < leaseCount; i++ {
wg.Add(1)
go func(i int) {
defer wg.Done()
options := []string{ options := []string{
"--endpoint-reconciler-type", "lease", "--endpoint-reconciler-type", "lease",
"--advertise-address", fmt.Sprintf("10.0.1.%v", i+10), "--advertise-address", fmt.Sprintf("10.0.1.%v", i+10),
} }
server := kubeapiservertesting.StartTestServerOrDie(t, instanceOptions, options, etcd) server := kubeapiservertesting.StartTestServerOrDie(t, instanceOptions, options, etcd)
leaseServers[i] = server leaseServers[i] = server
}(i)
} }
wg.Wait()
defer func() { defer func() {
for i := 0; i < leaseCount; i++ { for i := 0; i < leaseCount; i++ {
leaseServers[i].TearDownFn() leaseServers[i].TearDownFn()