mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 09:52:49 +00:00
kubelet: podresources: pack parameters in a struct
To enable rate limiting, needed for GA graduation, we need to pass more parameters to the already crowded `ListenAndServePodresources` function. To tidy up a bit, pack the parameters in a helper struct, with no intended changes in behavior. Signed-off-by: Francesco Romani <fromani@redhat.com>
This commit is contained in:
parent
08fbe92fa7
commit
09517c27c4
@ -2720,7 +2720,15 @@ func (kl *Kubelet) ListenAndServePodResources() {
|
|||||||
klog.V(2).InfoS("Failed to get local endpoint for PodResources endpoint", "err", err)
|
klog.V(2).InfoS("Failed to get local endpoint for PodResources endpoint", "err", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
server.ListenAndServePodResources(socket, kl.podManager, kl.containerManager, kl.containerManager, kl.containerManager)
|
|
||||||
|
providers := server.PodResourcesProviders{
|
||||||
|
Pods: kl.podManager,
|
||||||
|
Devices: kl.containerManager,
|
||||||
|
Cpus: kl.containerManager,
|
||||||
|
Memory: kl.containerManager,
|
||||||
|
}
|
||||||
|
|
||||||
|
server.ListenAndServePodResources(socket, providers)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the eligible dead container instances in a pod. Depending on the configuration, the latest dead containers may be kept around.
|
// Delete the eligible dead container instances in a pod. Depending on the configuration, the latest dead containers may be kept around.
|
||||||
|
@ -209,11 +209,20 @@ func ListenAndServeKubeletReadOnlyServer(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PodResourcesProviders struct {
|
||||||
|
Pods podresources.PodsProvider
|
||||||
|
Devices podresources.DevicesProvider
|
||||||
|
Cpus podresources.CPUsProvider
|
||||||
|
Memory podresources.MemoryProvider
|
||||||
|
}
|
||||||
|
|
||||||
// ListenAndServePodResources initializes a gRPC server to serve the PodResources service
|
// ListenAndServePodResources initializes a gRPC server to serve the PodResources service
|
||||||
func ListenAndServePodResources(socket string, podsProvider podresources.PodsProvider, devicesProvider podresources.DevicesProvider, cpusProvider podresources.CPUsProvider, memoryProvider podresources.MemoryProvider) {
|
func ListenAndServePodResources(socket string, providers PodResourcesProviders) {
|
||||||
server := grpc.NewServer()
|
server := grpc.NewServer()
|
||||||
podresourcesapiv1alpha1.RegisterPodResourcesListerServer(server, podresources.NewV1alpha1PodResourcesServer(podsProvider, devicesProvider))
|
|
||||||
podresourcesapi.RegisterPodResourcesListerServer(server, podresources.NewV1PodResourcesServer(podsProvider, devicesProvider, cpusProvider, memoryProvider))
|
podresourcesapiv1alpha1.RegisterPodResourcesListerServer(server, podresources.NewV1alpha1PodResourcesServer(providers.Pods, providers.Devices))
|
||||||
|
podresourcesapi.RegisterPodResourcesListerServer(server, podresources.NewV1PodResourcesServer(providers.Pods, providers.Devices, providers.Cpus, providers.Memory))
|
||||||
|
|
||||||
l, err := util.CreateListener(socket)
|
l, err := util.CreateListener(socket)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
klog.ErrorS(err, "Failed to create listener for podResources endpoint")
|
klog.ErrorS(err, "Failed to create listener for podResources endpoint")
|
||||||
|
Loading…
Reference in New Issue
Block a user