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
5863a3a3
Commit
5863a3a3
authored
Oct 20, 2016
by
Kubernetes Submit Queue
Committed by
GitHub
Oct 20, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #35098 from kargakis/redundant-deep-copy
Automatic merge from submit-queue registry: remove redundant PDB deep-copy from eviction REST
parents
29fc947c
3d23db53
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
eviction.go
pkg/registry/core/pod/etcd/eviction.go
+2
-8
No files found.
pkg/registry/core/pod/etcd/eviction.go
View file @
5863a3a3
...
@@ -107,14 +107,8 @@ func (r *EvictionREST) checkAndDecrement(namespace string, pdb policy.PodDisrupt
...
@@ -107,14 +107,8 @@ func (r *EvictionREST) checkAndDecrement(namespace string, pdb policy.PodDisrupt
return
false
,
nil
return
false
,
nil
}
}
copied
,
err
:=
api
.
Scheme
.
DeepCopy
(
pdb
)
pdb
.
Status
.
PodDisruptionAllowed
=
false
if
err
!=
nil
{
if
_
,
err
:=
r
.
podDisruptionBudgetClient
.
PodDisruptionBudgets
(
namespace
)
.
Update
(
&
pdb
);
err
!=
nil
{
return
false
,
err
}
newPDB
:=
copied
.
(
policy
.
PodDisruptionBudget
)
newPDB
.
Status
.
PodDisruptionAllowed
=
false
if
_
,
err
:=
r
.
podDisruptionBudgetClient
.
PodDisruptionBudgets
(
namespace
)
.
Update
(
&
newPDB
);
err
!=
nil
{
return
false
,
err
return
false
,
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