Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
de7e661a
Commit
de7e661a
authored
Aug 05, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Aug 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #50197 from mbssaiakhil/patch-5
Automatic merge from submit-queue Fix typos and grammatical errors in comments and variables
parents
eea9045a
0c548ea4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
rate_limiter_helper.go
pkg/controller/garbagecollector/rate_limiter_helper.go
+1
-1
eviction_manager.go
pkg/kubelet/eviction/eviction_manager.go
+2
-2
remote_runtime.go
pkg/kubelet/remote/remote_runtime.go
+3
-3
rkt.go
pkg/kubelet/rkt/rkt.go
+1
-1
No files found.
pkg/controller/garbagecollector/rate_limiter_helper.go
View file @
de7e661a
...
@@ -32,7 +32,7 @@ type RegisteredRateLimiter struct {
...
@@ -32,7 +32,7 @@ type RegisteredRateLimiter struct {
rateLimiters
map
[
schema
.
GroupVersion
]
*
sync
.
Once
rateLimiters
map
[
schema
.
GroupVersion
]
*
sync
.
Once
}
}
// NewRegisteredRateLimiter returns a new RegisteredRateLimi
a
ter.
// 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
{
...
...
pkg/kubelet/eviction/eviction_manager.go
View file @
de7e661a
...
@@ -309,8 +309,8 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act
...
@@ -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 u
s
age violation from local volume temporary storage
// If eviction happen
e
s 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
...
...
pkg/kubelet/remote/remote_runtime.go
View file @
de7e661a
...
@@ -38,20 +38,20 @@ type RemoteRuntimeService struct {
...
@@ -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
,
connectionTim
e
out
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
(
connectionTim
e
out
),
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
:
connectionTim
e
out
,
runtimeClient
:
runtimeapi
.
NewRuntimeServiceClient
(
conn
),
runtimeClient
:
runtimeapi
.
NewRuntimeServiceClient
(
conn
),
},
nil
},
nil
}
}
...
...
pkg/kubelet/rkt/rkt.go
View file @
de7e661a
...
@@ -847,7 +847,7 @@ func (r *Runtime) newAppcRuntimeApp(pod *v1.Pod, podIP string, c v1.Container, r
...
@@ -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 termin
t
ation 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment