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

Merge pull request #124589 from carlory/dra-resourceclaim-controller

Browse Source 
the resourceclaim controller forgot to wait for podSchedulingSynced and templatesSynced
This commit is contained in:
Kubernetes Prow Robot
2024-05-06 06:58:26 -07:00
committed by GitHub
parent d9c7616d4b 76aa289608
commit fdefcb43d1
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/resourceclaim/controller.go
View File

@@ -392,8 +392,8 @@ func (ec *Controller) Run(ctx context.Context, workers int) {
defer ec.queue.ShutDown()
logger := klog.FromContext(ctx)
logger.Info("Starting ephemeral volume controller")
defer logger.Info("Shutting down ephemeral volume controller")
logger.Info("Starting resource claim controller")
defer logger.Info("Shutting down resource claim controller")
eventBroadcaster := record.NewBroadcaster(record.WithContext(ctx))
eventBroadcaster.StartLogging(klog.Infof)
@@ -401,7 +401,7 @@ func (ec *Controller) Run(ctx context.Context, workers int) {
ec.recorder = eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "resource_claim"})
defer eventBroadcaster.Shutdown()
if !cache.WaitForNamedCacheSync("ephemeral", ctx.Done(), ec.podSynced, ec.claimsSynced) {
if !cache.WaitForNamedCacheSync("resource_claim", ctx.Done(), ec.podSynced, ec.podSchedulingSynced, ec.claimsSynced, ec.templatesSynced) {
return
}

4
pkg/controller/resourceclaim/controller_test.go
View File

@@ -35,7 +35,6 @@ import (
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
k8stesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
"k8s.io/component-base/metrics/testutil"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/controller"
@@ -520,14 +519,13 @@ func TestSyncHandler(t *testing.T) {
}
// Ensure informers are up-to-date.
go informerFactory.Start(ctx.Done())
informerFactory.Start(ctx.Done())
stopInformers := func() {
cancel()
informerFactory.Shutdown()
}
defer stopInformers()
informerFactory.WaitForCacheSync(ctx.Done())
cache.WaitForCacheSync(ctx.Done(), podInformer.Informer().HasSynced, claimInformer.Informer().HasSynced, templateInformer.Informer().HasSynced)
// Add claims that only exist in the mutation cache.
for _, claim := range tc.claimsInCache {