mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #42339 from ncdc/statefulset-wait-for-pvc-sync
Automatic merge from submit-queue statefulset: wait for pvc cache sync #42056 switched the statefulset controller to use the pvc shared informer/lister, but accidentally left out waiting for its cache to sync. cc @kubernetes/sig-apps-pr-reviews @kargakis @foxish @kow3ns @smarterclayton @deads2k
This commit is contained in:
commit
cdf0cae9e4
@ -64,6 +64,8 @@ type StatefulSetController struct {
|
||||
setLister appslisters.StatefulSetLister
|
||||
// setListerSynced returns true if the stateful set shared informer has synced at least once
|
||||
setListerSynced cache.InformerSynced
|
||||
// pvcListerSynced returns true if the pvc shared informer has synced at least once
|
||||
pvcListerSynced cache.InformerSynced
|
||||
// StatefulSets that need to be synced.
|
||||
queue workqueue.RateLimitingInterface
|
||||
}
|
||||
@ -91,7 +93,8 @@ func NewStatefulSetController(
|
||||
recorder,
|
||||
),
|
||||
),
|
||||
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "statefulset"),
|
||||
pvcListerSynced: pvcInformer.Informer().HasSynced,
|
||||
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "statefulset"),
|
||||
}
|
||||
|
||||
podInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||
@ -134,7 +137,7 @@ func (ssc *StatefulSetController) Run(workers int, stopCh <-chan struct{}) {
|
||||
|
||||
glog.Infof("Starting statefulset controller")
|
||||
|
||||
if !cache.WaitForCacheSync(stopCh, ssc.podListerSynced, ssc.setListerSynced) {
|
||||
if !cache.WaitForCacheSync(stopCh, ssc.podListerSynced, ssc.setListerSynced, ssc.pvcListerSynced) {
|
||||
utilruntime.HandleError(fmt.Errorf("timed out waiting for caches to sync"))
|
||||
return
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user