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
f74b4bbb
Commit
f74b4bbb
authored
Jan 16, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Jan 16, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38094 from yarntime/fix_update_typo
Automatic merge from submit-queue fix typos fix typos.
parents
adbf7137
f7c737e8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
deploymentcontroller.go
.../federation-controller/deployment/deploymentcontroller.go
+1
-1
reconciler.go
pkg/controller/volume/attachdetach/reconciler/reconciler.go
+1
-1
No files found.
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View file @
f74b4bbb
...
@@ -571,7 +571,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
...
@@ -571,7 +571,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
})
})
}
}
}
else
{
}
else
{
// TODO: Update only one deployment at a time if update strategy is rolling u
dp
ate.
// TODO: Update only one deployment at a time if update strategy is rolling u
pd
ate.
currentLd
:=
ldObj
.
(
*
extensionsv1
.
Deployment
)
currentLd
:=
ldObj
.
(
*
extensionsv1
.
Deployment
)
// Update existing replica set, if needed.
// Update existing replica set, if needed.
...
...
pkg/controller/volume/attachdetach/reconciler/reconciler.go
View file @
f74b4bbb
...
@@ -93,7 +93,7 @@ func (rc *reconciler) Run(stopCh <-chan struct{}) {
...
@@ -93,7 +93,7 @@ func (rc *reconciler) Run(stopCh <-chan struct{}) {
// reconciliationLoopFunc this can be disabled via cli option disableReconciliation.
// reconciliationLoopFunc this can be disabled via cli option disableReconciliation.
// It periodically checks whether the attached volumes from actual state
// It periodically checks whether the attached volumes from actual state
// are still attached to the node and u
dp
ate the status if they are not.
// are still attached to the node and u
pd
ate the status if they are not.
func
(
rc
*
reconciler
)
reconciliationLoopFunc
()
func
()
{
func
(
rc
*
reconciler
)
reconciliationLoopFunc
()
func
()
{
return
func
()
{
return
func
()
{
...
...
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