From 205c68351d58202139f1e4592b080e0fdb449cc6 Mon Sep 17 00:00:00 2001
From: foxish <ramanathana@google.com>
Date: Mon, 13 Feb 2017 11:51:26 -0800
Subject: [PATCH] Fix references to PetSet

---
 pkg/client/unversioned/conditions.go | 10 +++++-----
 pkg/kubectl/scale.go                 | 14 +++++++-------
 pkg/kubectl/stop.go                  | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkg/client/unversioned/conditions.go b/pkg/client/unversioned/conditions.go
index c9e891fed5..a8fbf9d8e9 100644
--- a/pkg/client/unversioned/conditions.go
+++ b/pkg/client/unversioned/conditions.go
@@ -78,15 +78,15 @@ func ReplicaSetHasDesiredReplicas(rsClient extensionsclient.ReplicaSetsGetter, r
 	}
 }
 
-// StatefulSetHasDesiredPets returns a conditon that checks the number of petset replicas
-func StatefulSetHasDesiredPets(psClient appsclient.StatefulSetsGetter, petset *apps.StatefulSet) wait.ConditionFunc {
-	// TODO: Differentiate between 0 pets and a really quick scale down using generation.
+// StatefulSetHasDesiredReplicas returns a conditon that checks the number of statefulset replicas
+func StatefulSetHasDesiredReplicas(ssClient appsclient.StatefulSetsGetter, ss *apps.StatefulSet) wait.ConditionFunc {
+	// TODO: Differentiate between 0 statefulset pods and a really quick scale down using generation.
 	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 {
 			return false, err
 		}
-		return ps.Status.Replicas == ps.Spec.Replicas, nil
+		return ss.Status.Replicas == ss.Spec.Replicas, nil
 	}
 }
 
diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go
index ebacf34ca2..8561a1f170 100644
--- a/pkg/kubectl/scale.go
+++ b/pkg/kubectl/scale.go
@@ -336,22 +336,22 @@ type StatefulSetScaler struct {
 // ScaleSimple does a simple one-shot attempt at scaling. It returns the
 // resourceVersion of the statefulset if the update is successful.
 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 {
 		return "", ScaleError{ScaleGetFailure, "Unknown", err}
 	}
 	if preconditions != nil {
-		if err := preconditions.ValidateStatefulSet(ps); err != nil {
+		if err := preconditions.ValidateStatefulSet(ss); err != nil {
 			return "", err
 		}
 	}
-	ps.Spec.Replicas = int32(newSize)
-	updatedStatefulSet, err := scaler.c.StatefulSets(namespace).Update(ps)
+	ss.Spec.Replicas = int32(newSize)
+	updatedStatefulSet, err := scaler.c.StatefulSets(namespace).Update(ss)
 	if err != nil {
 		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
 }
@@ -373,7 +373,7 @@ func (scaler *StatefulSetScaler) Scale(namespace, name string, newSize uint, pre
 		if err != nil {
 			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 {
 			return fmt.Errorf("timed out waiting for %q to be synced", name)
 		}
diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go
index 2a5074cd51..1924a4b613 100644
--- a/pkg/kubectl/stop.go
+++ b/pkg/kubectl/stop.go
@@ -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 {
 	statefulsets := reaper.client.StatefulSets(namespace)
 	scaler := &StatefulSetScaler{reaper.client}
-	ps, err := statefulsets.Get(name, metav1.GetOptions{})
+	ss, err := statefulsets.Get(name, metav1.GetOptions{})
 	if err != nil {
 		return err
 	}
 	if timeout == 0 {
-		numPets := ps.Spec.Replicas
-		timeout = Timeout + time.Duration(10*numPets)*time.Second
+		numReplicas := ss.Spec.Replicas
+		timeout = Timeout + time.Duration(10*numReplicas)*time.Second
 	}
 	retry := 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
 	}
 
-	// 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.
 	pods := reaper.podClient.Pods(namespace)
-	selector, _ := metav1.LabelSelectorAsSelector(ps.Spec.Selector)
+	selector, _ := metav1.LabelSelectorAsSelector(ss.Spec.Selector)
 	options := metav1.ListOptions{LabelSelector: selector.String()}
 	podList, err := pods.List(options)
 	if err != nil {