github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repairip wait for the default servicecidr

Browse Source
This commit is contained in:
Antonio Ojea
2024-06-18 20:12:52 +00:00
parent 8490273979
commit 418f98aae4
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/registry/core/service/ipallocator/controller/repairip.go
View File

@@ -42,6 +42,7 @@ import (
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/servicecidr" "k8s.io/kubernetes/pkg/api/servicecidr"
"k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/controlplane/controller/defaultservicecidr"
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/utils/clock" "k8s.io/utils/clock"
netutils "k8s.io/utils/net" netutils "k8s.io/utils/net"
@@ -203,6 +204,20 @@ func (r *RepairIPAddress) RunUntil(onFirstSuccess func(), stopCh chan struct{})
return return
} }
// wait for the default ServiceCIDR
ctx := wait.ContextForChannel(stopCh)
err := wait.PollUntilContextCancel(ctx, 100*time.Millisecond, true, func(context.Context) (bool, error) {
_, err := r.serviceCIDRLister.Get(defaultservicecidr.DefaultServiceCIDRName)
if err != nil {
return false, nil
}
return true, nil
})
if err != nil {
runtime.HandleError(err)
return
}
// First sync goes through all the Services and IPAddresses in the cache, // First sync goes through all the Services and IPAddresses in the cache,
// once synced, it signals the main loop and works using the handlers, since // once synced, it signals the main loop and works using the handlers, since
// it's less expensive and more optimal. // it's less expensive and more optimal.