github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41356 from foxish/fix-petset-refs

Browse Source 
Automatic merge from submit-queue

Fix references to PetSet

Removing PetSet references in scaler/reaper code

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-23 19:55:33 -08:00 committed by GitHub
commit 072e68f0a6
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/client/unversioned/conditions.go
View File

@ -78,15 +78,15 @@ func ReplicaSetHasDesiredReplicas(rsClient extensionsclient.ReplicaSetsGetter, r
} }
} }
// StatefulSetHasDesiredPets returns a conditon that checks the number of petset replicas // StatefulSetHasDesiredReplicas returns a conditon that checks the number of statefulset replicas
func StatefulSetHasDesiredPets(psClient appsclient.StatefulSetsGetter, petset *apps.StatefulSet) wait.ConditionFunc { func StatefulSetHasDesiredReplicas(ssClient appsclient.StatefulSetsGetter, ss *apps.StatefulSet) wait.ConditionFunc {
// TODO: Differentiate between 0 pets and a really quick scale down using generation. // TODO: Differentiate between 0 statefulset pods and a really quick scale down using generation.
return func() (bool, error) { return func() (bool, error) {
ps, err := psClient.StatefulSets(petset.Namespace).Get(petset.Name, metav1.GetOptions{}) ss, err := ssClient.StatefulSets(ss.Namespace).Get(ss.Name, metav1.GetOptions{})
if err != nil { if err != nil {
return false, err return false, err
} }
return ps.Status.Replicas == ps.Spec.Replicas, nil return ss.Status.Replicas == ss.Spec.Replicas, nil
} }
} }

14
pkg/kubectl/scale.go
View File

@ -336,22 +336,22 @@ type StatefulSetScaler struct {
// ScaleSimple does a simple one-shot attempt at scaling. It returns the // ScaleSimple does a simple one-shot attempt at scaling. It returns the
// resourceVersion of the statefulset if the update is successful. // resourceVersion of the statefulset if the update is successful.
func (scaler *StatefulSetScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) { func (scaler *StatefulSetScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) {
ps, err := scaler.c.StatefulSets(namespace).Get(name, metav1.GetOptions{}) ss, err := scaler.c.StatefulSets(namespace).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", ScaleError{ScaleGetFailure, "Unknown", err} return "", ScaleError{ScaleGetFailure, "Unknown", err}
} }
if preconditions != nil { if preconditions != nil {
if err := preconditions.ValidateStatefulSet(ps); err != nil { if err := preconditions.ValidateStatefulSet(ss); err != nil {
return "", err return "", err
} }
} }
ps.Spec.Replicas = int32(newSize) ss.Spec.Replicas = int32(newSize)
updatedStatefulSet, err := scaler.c.StatefulSets(namespace).Update(ps) updatedStatefulSet, err := scaler.c.StatefulSets(namespace).Update(ss)
if err != nil { if err != nil {
if errors.IsConflict(err) { if errors.IsConflict(err) {
return "", ScaleError{ScaleUpdateConflictFailure, ps.ResourceVersion, err} return "", ScaleError{ScaleUpdateConflictFailure, ss.ResourceVersion, err}
} }
return "", ScaleError{ScaleUpdateFailure, ps.ResourceVersion, err} return "", ScaleError{ScaleUpdateFailure, ss.ResourceVersion, err}
} }
return updatedStatefulSet.ResourceVersion, nil return updatedStatefulSet.ResourceVersion, nil
} }
@ -373,7 +373,7 @@ func (scaler *StatefulSetScaler) Scale(namespace, name string, newSize uint, pre
if err != nil { if err != nil {
return err return err
} }
err = wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, client.StatefulSetHasDesiredPets(scaler.c, job)) err = wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, client.StatefulSetHasDesiredReplicas(scaler.c, job))
if err == wait.ErrWaitTimeout { if err == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for %q to be synced", name) return fmt.Errorf("timed out waiting for %q to be synced", name)
} }

10
pkg/kubectl/stop.go
View File

@ -328,13 +328,13 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error { func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error {
statefulsets := reaper.client.StatefulSets(namespace) statefulsets := reaper.client.StatefulSets(namespace)
scaler := &StatefulSetScaler{reaper.client} scaler := &StatefulSetScaler{reaper.client}
ps, err := statefulsets.Get(name, metav1.GetOptions{}) ss, err := statefulsets.Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return err return err
} }
if timeout == 0 { if timeout == 0 {
numPets := ps.Spec.Replicas numReplicas := ss.Spec.Replicas
timeout = Timeout + time.Duration(10*numPets)*time.Second timeout = Timeout + time.Duration(10*numReplicas)*time.Second
} }
retry := NewRetryParams(reaper.pollInterval, reaper.timeout) retry := NewRetryParams(reaper.pollInterval, reaper.timeout)
waitForStatefulSet := NewRetryParams(reaper.pollInterval, reaper.timeout) waitForStatefulSet := NewRetryParams(reaper.pollInterval, reaper.timeout)
@ -342,10 +342,10 @@ func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Durat
return err return err
} }
// TODO: This shouldn't be needed, see corresponding TODO in StatefulSetHasDesiredPets. // TODO: This shouldn't be needed, see corresponding TODO in StatefulSetHasDesiredReplicas.
// StatefulSet should track generation number. // StatefulSet should track generation number.
pods := reaper.podClient.Pods(namespace) pods := reaper.podClient.Pods(namespace)
selector, _ := metav1.LabelSelectorAsSelector(ps.Spec.Selector) selector, _ := metav1.LabelSelectorAsSelector(ss.Spec.Selector)
options := metav1.ListOptions{LabelSelector: selector.String()} options := metav1.ListOptions{LabelSelector: selector.String()}
podList, err := pods.List(options) podList, err := pods.List(options)
if err != nil { if err != nil {