github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122146 from pohly/dra-helper-context-support

Browse Source 
DRA helper: enhance context support
This commit is contained in:
Kubernetes Prow Robot 2023-12-14 12:57:25 +01:00 committed by GitHub
commit 8690bbc9c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/dynamic-resource-allocation/controller/controller.go
View File

@ -189,7 +189,7 @@ func New(
schedulingCtxInformer := informerFactory.Resource().V1alpha2().PodSchedulingContexts() schedulingCtxInformer := informerFactory.Resource().V1alpha2().PodSchedulingContexts()
claimNameLookup := resourceclaim.NewNameLookup(kubeClient) claimNameLookup := resourceclaim.NewNameLookup(kubeClient)
eventBroadcaster := record.NewBroadcaster() eventBroadcaster := record.NewBroadcaster(record.WithContext(ctx))
go func() { go func() {
<-ctx.Done() <-ctx.Done()
eventBroadcaster.Shutdown() eventBroadcaster.Shutdown()

10
staging/src/k8s.io/dynamic-resource-allocation/leaderelection/leaderelection.go
View File

@ -161,6 +161,10 @@ func (l *leaderElection) PrepareHealthCheck(s Server) {
} }
func (l *leaderElection) Run() error { func (l *leaderElection) Run() error {
ctx := l.ctx
if ctx == nil {
ctx = context.Background()
}
if l.identity == "" { if l.identity == "" {
id, err := defaultLeaderElectionIdentity() id, err := defaultLeaderElectionIdentity()
if err != nil { if err != nil {
@ -174,7 +178,7 @@ func (l *leaderElection) Run() error {
l.namespace = inClusterNamespace() l.namespace = inClusterNamespace()
} }
broadcaster := record.NewBroadcaster() broadcaster := record.NewBroadcaster(record.WithContext(ctx))
broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: l.clientset.CoreV1().Events(l.namespace)}) broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: l.clientset.CoreV1().Events(l.namespace)})
eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: fmt.Sprintf("%s/%s", l.lockName, l.identity)}) eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: fmt.Sprintf("%s/%s", l.lockName, l.identity)})
@ -188,10 +192,6 @@ func (l *leaderElection) Run() error {
return err return err
} }
ctx := l.ctx
if ctx == nil {
ctx = context.Background()
}
leaderConfig := leaderelection.LeaderElectionConfig{ leaderConfig := leaderelection.LeaderElectionConfig{
Lock: lock, Lock: lock,
LeaseDuration: l.leaseDuration, LeaseDuration: l.leaseDuration,