mirror of https://github.com/k3s-io/k3s
Merge pull request #50197 from mbssaiakhil/patch-5
Automatic merge from submit-queue Fix typos and grammatical errors in comments and variablespull/6/head
commit
de7e661aac
|
@ -32,7 +32,7 @@ type RegisteredRateLimiter struct {
|
||||||
rateLimiters map[schema.GroupVersion]*sync.Once
|
rateLimiters map[schema.GroupVersion]*sync.Once
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewRegisteredRateLimiter returns a new RegisteredRateLimiater.
|
// NewRegisteredRateLimiter returns a new RegisteredRateLimiter.
|
||||||
// TODO: NewRegisteredRateLimiter is not dynamic. We need to find a better way
|
// TODO: NewRegisteredRateLimiter is not dynamic. We need to find a better way
|
||||||
// when GC dynamically change the resources it monitors.
|
// when GC dynamically change the resources it monitors.
|
||||||
func NewRegisteredRateLimiter(resources map[schema.GroupVersionResource]struct{}) *RegisteredRateLimiter {
|
func NewRegisteredRateLimiter(resources map[schema.GroupVersionResource]struct{}) *RegisteredRateLimiter {
|
||||||
|
|
|
@ -309,8 +309,8 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act
|
||||||
m.lastObservations = observations
|
m.lastObservations = observations
|
||||||
m.Unlock()
|
m.Unlock()
|
||||||
|
|
||||||
// evict pods if there is a resource uage violation from local volume temporary storage
|
// evict pods if there is a resource usage violation from local volume temporary storage
|
||||||
// If eviction happenes in localVolumeEviction function, skip the rest of eviction action
|
// If eviction happens in localVolumeEviction function, skip the rest of eviction action
|
||||||
if utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
|
if utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
|
||||||
if evictedPods := m.localStorageEviction(activePods); len(evictedPods) > 0 {
|
if evictedPods := m.localStorageEviction(activePods); len(evictedPods) > 0 {
|
||||||
return evictedPods
|
return evictedPods
|
||||||
|
|
|
@ -38,20 +38,20 @@ type RemoteRuntimeService struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewRemoteRuntimeService creates a new internalapi.RuntimeService.
|
// NewRemoteRuntimeService creates a new internalapi.RuntimeService.
|
||||||
func NewRemoteRuntimeService(endpoint string, connectionTimout time.Duration) (internalapi.RuntimeService, error) {
|
func NewRemoteRuntimeService(endpoint string, connectionTimeout time.Duration) (internalapi.RuntimeService, error) {
|
||||||
glog.Infof("Connecting to runtime service %s", endpoint)
|
glog.Infof("Connecting to runtime service %s", endpoint)
|
||||||
addr, dailer, err := util.GetAddressAndDialer(endpoint)
|
addr, dailer, err := util.GetAddressAndDialer(endpoint)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithTimeout(connectionTimout), grpc.WithDialer(dailer))
|
conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithTimeout(connectionTimeout), grpc.WithDialer(dailer))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Errorf("Connect remote runtime %s failed: %v", addr, err)
|
glog.Errorf("Connect remote runtime %s failed: %v", addr, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return &RemoteRuntimeService{
|
return &RemoteRuntimeService{
|
||||||
timeout: connectionTimout,
|
timeout: connectionTimeout,
|
||||||
runtimeClient: runtimeapi.NewRuntimeServiceClient(conn),
|
runtimeClient: runtimeapi.NewRuntimeServiceClient(conn),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -847,7 +847,7 @@ func (r *Runtime) newAppcRuntimeApp(pod *v1.Pod, podIP string, c v1.Container, r
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create additional mount for termintation message path.
|
// Create additional mount for termination message path.
|
||||||
mount, err := r.makeContainerLogMount(opts, &c)
|
mount, err := r.makeContainerLogMount(opts, &c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue