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
9d0baa75
Unverified
Commit
9d0baa75
authored
Mar 04, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Mar 04, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #74563 from vanduc95/fix-error-string
fix error string should not be capitalized
parents
35c9624f
e580a9e5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
core.go
cmd/kube-controller-manager/app/core.go
+3
-3
plugins.go
cmd/kube-controller-manager/app/plugins.go
+1
-1
No files found.
cmd/kube-controller-manager/app/core.go
View file @
9d0baa75
...
@@ -214,7 +214,7 @@ func startPersistentVolumeBinderController(ctx ControllerContext) (http.Handler,
...
@@ -214,7 +214,7 @@ func startPersistentVolumeBinderController(ctx ControllerContext) (http.Handler,
func
startAttachDetachController
(
ctx
ControllerContext
)
(
http
.
Handler
,
bool
,
error
)
{
func
startAttachDetachController
(
ctx
ControllerContext
)
(
http
.
Handler
,
bool
,
error
)
{
if
ctx
.
ComponentConfig
.
AttachDetachController
.
ReconcilerSyncLoopPeriod
.
Duration
<
time
.
Second
{
if
ctx
.
ComponentConfig
.
AttachDetachController
.
ReconcilerSyncLoopPeriod
.
Duration
<
time
.
Second
{
return
nil
,
true
,
fmt
.
Errorf
(
"
D
uration time must be greater than one second as set via command line option reconcile-sync-loop-period"
)
return
nil
,
true
,
fmt
.
Errorf
(
"
d
uration time must be greater than one second as set via command line option reconcile-sync-loop-period"
)
}
}
csiClientConfig
:=
ctx
.
ClientBuilder
.
ConfigOrDie
(
"attachdetach-controller"
)
csiClientConfig
:=
ctx
.
ClientBuilder
.
ConfigOrDie
(
"attachdetach-controller"
)
// csiClient works with CRDs that support json only
// csiClient works with CRDs that support json only
...
@@ -252,7 +252,7 @@ func startVolumeExpandController(ctx ControllerContext) (http.Handler, bool, err
...
@@ -252,7 +252,7 @@ func startVolumeExpandController(ctx ControllerContext) (http.Handler, bool, err
ProbeExpandableVolumePlugins
(
ctx
.
ComponentConfig
.
PersistentVolumeBinderController
.
VolumeConfiguration
))
ProbeExpandableVolumePlugins
(
ctx
.
ComponentConfig
.
PersistentVolumeBinderController
.
VolumeConfiguration
))
if
expandControllerErr
!=
nil
{
if
expandControllerErr
!=
nil
{
return
nil
,
true
,
fmt
.
Errorf
(
"
F
ailed to start volume expand controller : %v"
,
expandControllerErr
)
return
nil
,
true
,
fmt
.
Errorf
(
"
f
ailed to start volume expand controller : %v"
,
expandControllerErr
)
}
}
go
expandController
.
Run
(
ctx
.
Stop
)
go
expandController
.
Run
(
ctx
.
Stop
)
return
nil
,
true
,
nil
return
nil
,
true
,
nil
...
@@ -408,7 +408,7 @@ func startGarbageCollectorController(ctx ControllerContext) (http.Handler, bool,
...
@@ -408,7 +408,7 @@ func startGarbageCollectorController(ctx ControllerContext) (http.Handler, bool,
ctx
.
InformersStarted
,
ctx
.
InformersStarted
,
)
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
true
,
fmt
.
Errorf
(
"
F
ailed to start the generic garbage collector: %v"
,
err
)
return
nil
,
true
,
fmt
.
Errorf
(
"
f
ailed to start the generic garbage collector: %v"
,
err
)
}
}
// Start the garbage collector.
// Start the garbage collector.
...
...
cmd/kube-controller-manager/app/plugins.go
View file @
9d0baa75
...
@@ -178,7 +178,7 @@ func AttemptToLoadRecycler(path string, config *volume.VolumeConfig) error {
...
@@ -178,7 +178,7 @@ func AttemptToLoadRecycler(path string, config *volume.VolumeConfig) error {
return
err
return
err
}
}
if
err
=
volume
.
ValidateRecyclerPodTemplate
(
recyclerPod
);
err
!=
nil
{
if
err
=
volume
.
ValidateRecyclerPodTemplate
(
recyclerPod
);
err
!=
nil
{
return
fmt
.
Errorf
(
"
P
od specification (%v): %v"
,
path
,
err
)
return
fmt
.
Errorf
(
"
p
od specification (%v): %v"
,
path
,
err
)
}
}
config
.
RecyclerPodTemplate
=
recyclerPod
config
.
RecyclerPodTemplate
=
recyclerPod
}
}
...
...
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