github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-26 07:14:12 +00:00
Code Issues Projects Releases Wiki Activity

refactor(apiextensions-apiserver): Make NamingConditionController fully context-aware

Browse Source
This commit is contained in:
Aditi Gupta
2025-09-19 11:56:52 -07:00
parent 203793fe65
commit 90bd84798c
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
View File

@@ -242,7 +242,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
}
}
go namingController.Run(hookContext.Done())
go namingController.RunWithContext(hookContext)
go establishingController.RunWithContext(hookContext)
go nonStructuralSchemaController.Run(5, hookContext.Done())
go apiApprovalController.Run(5, hookContext.Done())

26
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go
View File

@@ -56,7 +56,7 @@ type NamingConditionController struct {
crdMutationCache cache.MutationCache
// To allow injection for testing.
syncFn func(key string) error
syncFn func(ctx context.Context, key string) error
queue workqueue.TypedRateLimitingInterface[string]
}
@@ -239,7 +239,7 @@ func equalToAcceptedOrFresh(requestedName, acceptedName string, usedNames sets.S
return fmt.Errorf("%q is already in use", requestedName)
}
func (c *NamingConditionController) sync(key string) error {
func (c *NamingConditionController) sync(ctx context.Context, key string) error {
inCustomResourceDefinition, err := c.crdLister.Get(key)
if apierrors.IsNotFound(err) {
// CRD was deleted and has freed its names.
@@ -271,7 +271,7 @@ func (c *NamingConditionController) sync(key string) error {
apiextensionshelpers.SetCRDCondition(crd, namingCondition)
apiextensionshelpers.SetCRDCondition(crd, establishedCondition)
updatedObj, err := c.crdClient.CustomResourceDefinitions().UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{})
updatedObj, err := c.crdClient.CustomResourceDefinitions().UpdateStatus(ctx, crd, metav1.UpdateOptions{})
if apierrors.IsNotFound(err) || apierrors.IsConflict(err) {
// deleted or changed in the meantime, we'll get called again
return nil
@@ -292,37 +292,43 @@ func (c *NamingConditionController) sync(key string) error {
return nil
}
//logcheck:context // RunWithContext should be used instead of Run in code which supports contextual logging.
func (c *NamingConditionController) Run(stopCh <-chan struct{}) {
c.RunWithContext(wait.ContextForChannel(stopCh))
}
// RunWithContext is a context-aware version of Run.
func (c *NamingConditionController) RunWithContext(ctx context.Context) {
defer utilruntime.HandleCrash()
defer c.queue.ShutDown()
klog.Info("Starting NamingConditionController")
defer klog.Info("Shutting down NamingConditionController")
if !cache.WaitForCacheSync(stopCh, c.crdSynced) {
if !cache.WaitForCacheSync(ctx.Done(), c.crdSynced) {
return
}
// only start one worker thread since its a slow moving API and the naming conflict resolution bits aren't thread-safe
go wait.Until(c.runWorker, time.Second, stopCh)
go wait.UntilWithContext(ctx, c.runWorker, time.Second)
<-stopCh
<-ctx.Done()
}
func (c *NamingConditionController) runWorker() {
for c.processNextWorkItem() {
func (c *NamingConditionController) runWorker(ctx context.Context) {
for c.processNextWorkItem(ctx) {
}
}
// processNextWorkItem deals with one key off the queue. It returns false when it's time to quit.
func (c *NamingConditionController) processNextWorkItem() bool {
func (c *NamingConditionController) processNextWorkItem(ctx context.Context) bool {
key, quit := c.queue.Get()
if quit {
return false
}
defer c.queue.Done(key)
err := c.syncFn(key)
err := c.syncFn(ctx, key)
if err == nil {
c.queue.Forget(key)
return true