github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Pass addressable values to DeepCopy

Browse Source
This commit is contained in:
Jordan Liggitt
2016-12-04 15:51:44 -05:00
parent 8f11cc78a8
commit 6819706adf
46 changed files with 89 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controller/disruption/disruption.go
View File

@@ -644,14 +644,14 @@ func (dc *DisruptionController) buildDisruptedPodMap(pods []*v1.Pod, pdb *policy
// this field correctly, we will prevent the /evict handler from approving an
// eviction when it may be unsafe to do so.
func (dc *DisruptionController) failSafe(pdb *policy.PodDisruptionBudget) error {
obj, err := api.Scheme.DeepCopy(*pdb)
obj, err := api.Scheme.DeepCopy(pdb)
if err != nil {
return err
}
newPdb := obj.(policy.PodDisruptionBudget)
newPdb := obj.(*policy.PodDisruptionBudget)
newPdb.Status.PodDisruptionsAllowed = 0
return dc.getUpdater()(&newPdb)
return dc.getUpdater()(newPdb)
}
func (dc *DisruptionController) updatePdbStatus(pdb *policy.PodDisruptionBudget, currentHealthy, desiredHealthy, expectedCount int32,
@@ -675,11 +675,11 @@ func (dc *DisruptionController) updatePdbStatus(pdb *policy.PodDisruptionBudget,
return nil
}
obj, err := api.Scheme.DeepCopy(*pdb)
obj, err := api.Scheme.DeepCopy(pdb)
if err != nil {
return err
}
newPdb := obj.(policy.PodDisruptionBudget)
newPdb := obj.(*policy.PodDisruptionBudget)
newPdb.Status = policy.PodDisruptionBudgetStatus{
CurrentHealthy: currentHealthy,
@@ -690,7 +690,7 @@ func (dc *DisruptionController) updatePdbStatus(pdb *policy.PodDisruptionBudget,
ObservedGeneration: pdb.Generation,
}
return dc.getUpdater()(&newPdb)
return dc.getUpdater()(newPdb)
}
// refresh tries to re-GET the given PDB. If there are any errors, it just