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
dc2c0034
Commit
dc2c0034
authored
Aug 30, 2018
by
AdamDang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct some errors in returned message
Update stateful_set.go Update azure_vmss.go Update azure_vmss.go Update disruption.go Update stateful_set.go
parent
8aea6746
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
azure_vmss.go
pkg/cloudprovider/providers/azure/azure_vmss.go
+1
-1
disruption.go
pkg/controller/disruption/disruption.go
+2
-2
stateful_set.go
pkg/controller/statefulset/stateful_set.go
+1
-1
No files found.
pkg/cloudprovider/providers/azure/azure_vmss.go
View file @
dc2c0034
...
...
@@ -139,7 +139,7 @@ func (ss *scaleSet) getVmssVMByInstanceID(resourceGroup, scaleSetName, instanceI
}
if
cachedVM
==
nil
{
glog
.
Errorf
(
"cou
nd't find vmss virtual machine by scaleSetName (%q) and instanceID (%q
)"
,
scaleSetName
,
instanceID
)
glog
.
Errorf
(
"cou
ldn't find vmss virtual machine by scaleSetName (%s) and instanceID (%s
)"
,
scaleSetName
,
instanceID
)
return
vm
,
cloudprovider
.
InstanceNotFound
}
...
...
pkg/controller/disruption/disruption.go
View file @
dc2c0034
...
...
@@ -379,7 +379,7 @@ func (dc *DisruptionController) deletePod(obj interface{}) {
func
(
dc
*
DisruptionController
)
enqueuePdb
(
pdb
*
policy
.
PodDisruptionBudget
)
{
key
,
err
:=
controller
.
KeyFunc
(
pdb
)
if
err
!=
nil
{
glog
.
Errorf
(
"Cou
nd
't get key for PodDisruptionBudget object %+v: %v"
,
pdb
,
err
)
glog
.
Errorf
(
"Cou
ldn
't get key for PodDisruptionBudget object %+v: %v"
,
pdb
,
err
)
return
}
dc
.
queue
.
Add
(
key
)
...
...
@@ -388,7 +388,7 @@ func (dc *DisruptionController) enqueuePdb(pdb *policy.PodDisruptionBudget) {
func
(
dc
*
DisruptionController
)
enqueuePdbForRecheck
(
pdb
*
policy
.
PodDisruptionBudget
,
delay
time
.
Duration
)
{
key
,
err
:=
controller
.
KeyFunc
(
pdb
)
if
err
!=
nil
{
glog
.
Errorf
(
"Cou
nd
't get key for PodDisruptionBudget object %+v: %v"
,
pdb
,
err
)
glog
.
Errorf
(
"Cou
ldn
't get key for PodDisruptionBudget object %+v: %v"
,
pdb
,
err
)
return
}
dc
.
recheckQueue
.
AddAfter
(
key
,
delay
)
...
...
pkg/controller/statefulset/stateful_set.go
View file @
dc2c0034
...
...
@@ -382,7 +382,7 @@ func (ssc *StatefulSetController) resolveControllerRef(namespace string, control
func
(
ssc
*
StatefulSetController
)
enqueueStatefulSet
(
obj
interface
{})
{
key
,
err
:=
controller
.
KeyFunc
(
obj
)
if
err
!=
nil
{
utilruntime
.
HandleError
(
fmt
.
Errorf
(
"Cou
nd
't get key for object %+v: %v"
,
obj
,
err
))
utilruntime
.
HandleError
(
fmt
.
Errorf
(
"Cou
ldn
't get key for object %+v: %v"
,
obj
,
err
))
return
}
ssc
.
queue
.
Add
(
key
)
...
...
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