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
b62c0fde
Unverified
Commit
b62c0fde
authored
Oct 30, 2018
by
k8s-ci-robot
Committed by
GitHub
Oct 30, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #68048 from AdamDang/patch-17
Correct some errors in returned message
parents
f9c744ac
dc2c0034
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 @
b62c0fde
...
@@ -159,7 +159,7 @@ func (ss *scaleSet) getVmssVMByInstanceID(resourceGroup, scaleSetName, instanceI
...
@@ -159,7 +159,7 @@ func (ss *scaleSet) getVmssVMByInstanceID(resourceGroup, scaleSetName, instanceI
}
}
if
cachedVM
==
nil
{
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
return
vm
,
cloudprovider
.
InstanceNotFound
}
}
...
...
pkg/controller/disruption/disruption.go
View file @
b62c0fde
...
@@ -379,7 +379,7 @@ func (dc *DisruptionController) deletePod(obj interface{}) {
...
@@ -379,7 +379,7 @@ func (dc *DisruptionController) deletePod(obj interface{}) {
func
(
dc
*
DisruptionController
)
enqueuePdb
(
pdb
*
policy
.
PodDisruptionBudget
)
{
func
(
dc
*
DisruptionController
)
enqueuePdb
(
pdb
*
policy
.
PodDisruptionBudget
)
{
key
,
err
:=
controller
.
KeyFunc
(
pdb
)
key
,
err
:=
controller
.
KeyFunc
(
pdb
)
if
err
!=
nil
{
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
return
}
}
dc
.
queue
.
Add
(
key
)
dc
.
queue
.
Add
(
key
)
...
@@ -388,7 +388,7 @@ func (dc *DisruptionController) enqueuePdb(pdb *policy.PodDisruptionBudget) {
...
@@ -388,7 +388,7 @@ func (dc *DisruptionController) enqueuePdb(pdb *policy.PodDisruptionBudget) {
func
(
dc
*
DisruptionController
)
enqueuePdbForRecheck
(
pdb
*
policy
.
PodDisruptionBudget
,
delay
time
.
Duration
)
{
func
(
dc
*
DisruptionController
)
enqueuePdbForRecheck
(
pdb
*
policy
.
PodDisruptionBudget
,
delay
time
.
Duration
)
{
key
,
err
:=
controller
.
KeyFunc
(
pdb
)
key
,
err
:=
controller
.
KeyFunc
(
pdb
)
if
err
!=
nil
{
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
return
}
}
dc
.
recheckQueue
.
AddAfter
(
key
,
delay
)
dc
.
recheckQueue
.
AddAfter
(
key
,
delay
)
...
...
pkg/controller/statefulset/stateful_set.go
View file @
b62c0fde
...
@@ -382,7 +382,7 @@ func (ssc *StatefulSetController) resolveControllerRef(namespace string, control
...
@@ -382,7 +382,7 @@ func (ssc *StatefulSetController) resolveControllerRef(namespace string, control
func
(
ssc
*
StatefulSetController
)
enqueueStatefulSet
(
obj
interface
{})
{
func
(
ssc
*
StatefulSetController
)
enqueueStatefulSet
(
obj
interface
{})
{
key
,
err
:=
controller
.
KeyFunc
(
obj
)
key
,
err
:=
controller
.
KeyFunc
(
obj
)
if
err
!=
nil
{
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
return
}
}
ssc
.
queue
.
Add
(
key
)
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