Refactor pkg/kubectl/{scale.go|rollingupdater.go} for move to staging
Kubernetes-commit: c011df28a468145f76af78fdad87ca3909a8fab2
This commit is contained in:
Sean Sullivan
Kubernetes Publisher
parent
01bddde192
commit
8fd13deb58
|
|
@ -0,0 +1,187 @@
|
|||
/*
|
||||
Copyright 2014 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package scale
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
autoscalingv1 "k8s.io/api/autoscaling/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
scaleclient "k8s.io/client-go/scale"
|
||||
)
|
||||
|
||||
// Scaler provides an interface for resources that can be scaled.
|
||||
type Scaler interface {
|
||||
// Scale scales the named resource after checking preconditions. It optionally
|
||||
// retries in the event of resource version mismatch (if retry is not nil),
|
||||
// and optionally waits until the status of the resource matches newSize (if wait is not nil)
|
||||
// TODO: Make the implementation of this watch-based (#56075) once #31345 is fixed.
|
||||
Scale(namespace, name string, newSize uint, preconditions *ScalePrecondition, retry, wait *RetryParams, gr schema.GroupResource) error
|
||||
// ScaleSimple does a simple one-shot attempt at scaling - not useful on its own, but
|
||||
// a necessary building block for Scale
|
||||
ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint, gr schema.GroupResource) (updatedResourceVersion string, err error)
|
||||
}
|
||||
|
||||
// NewScaler get a scaler for a given resource
|
||||
func NewScaler(scalesGetter scaleclient.ScalesGetter) Scaler {
|
||||
return &genericScaler{scalesGetter}
|
||||
}
|
||||
|
||||
// ScalePrecondition describes a condition that must be true for the scale to take place
|
||||
// If CurrentSize == -1, it is ignored.
|
||||
// If CurrentResourceVersion is the empty string, it is ignored.
|
||||
// Otherwise they must equal the values in the resource for it to be valid.
|
||||
type ScalePrecondition struct {
|
||||
Size int
|
||||
ResourceVersion string
|
||||
}
|
||||
|
||||
// A PreconditionError is returned when a resource fails to match
|
||||
// the scale preconditions passed to kubectl.
|
||||
type PreconditionError struct {
|
||||
Precondition string
|
||||
ExpectedValue string
|
||||
ActualValue string
|
||||
}
|
||||
|
||||
func (pe PreconditionError) Error() string {
|
||||
return fmt.Sprintf("Expected %s to be %s, was %s", pe.Precondition, pe.ExpectedValue, pe.ActualValue)
|
||||
}
|
||||
|
||||
// RetryParams encapsulates the retry parameters used by kubectl's scaler.
|
||||
type RetryParams struct {
|
||||
Interval, Timeout time.Duration
|
||||
}
|
||||
|
||||
func NewRetryParams(interval, timeout time.Duration) *RetryParams {
|
||||
return &RetryParams{interval, timeout}
|
||||
}
|
||||
|
||||
// ScaleCondition is a closure around Scale that facilitates retries via util.wait
|
||||
func ScaleCondition(r Scaler, precondition *ScalePrecondition, namespace, name string, count uint, updatedResourceVersion *string, gr schema.GroupResource) wait.ConditionFunc {
|
||||
return func() (bool, error) {
|
||||
rv, err := r.ScaleSimple(namespace, name, precondition, count, gr)
|
||||
if updatedResourceVersion != nil {
|
||||
*updatedResourceVersion = rv
|
||||
}
|
||||
// Retry only on update conflicts.
|
||||
if errors.IsConflict(err) {
|
||||
return false, nil
|
||||
}
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
|
||||
// validateGeneric ensures that the preconditions match. Returns nil if they are valid, otherwise an error
|
||||
func (precondition *ScalePrecondition) validate(scale *autoscalingv1.Scale) error {
|
||||
if precondition.Size != -1 && int(scale.Spec.Replicas) != precondition.Size {
|
||||
return PreconditionError{"replicas", strconv.Itoa(precondition.Size), strconv.Itoa(int(scale.Spec.Replicas))}
|
||||
}
|
||||
if len(precondition.ResourceVersion) > 0 && scale.ResourceVersion != precondition.ResourceVersion {
|
||||
return PreconditionError{"resource version", precondition.ResourceVersion, scale.ResourceVersion}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// genericScaler can update scales for resources in a particular namespace
|
||||
type genericScaler struct {
|
||||
scaleNamespacer scaleclient.ScalesGetter
|
||||
}
|
||||
|
||||
var _ Scaler = &genericScaler{}
|
||||
|
||||
// ScaleSimple updates a scale of a given resource. It returns the resourceVersion of the scale if the update was successful.
|
||||
func (s *genericScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint, gr schema.GroupResource) (updatedResourceVersion string, err error) {
|
||||
scale := &autoscalingv1.Scale{
|
||||
ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: name},
|
||||
}
|
||||
if preconditions != nil {
|
||||
var err error
|
||||
scale, err = s.scaleNamespacer.Scales(namespace).Get(gr, name)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if err := preconditions.validate(scale); err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
|
||||
scale.Spec.Replicas = int32(newSize)
|
||||
updatedScale, err := s.scaleNamespacer.Scales(namespace).Update(gr, scale)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return updatedScale.ResourceVersion, nil
|
||||
}
|
||||
|
||||
// Scale updates a scale of a given resource to a new size, with optional precondition check (if preconditions is not nil),
|
||||
// optional retries (if retry is not nil), and then optionally waits for the status to reach desired count.
|
||||
func (s *genericScaler) Scale(namespace, resourceName string, newSize uint, preconditions *ScalePrecondition, retry, waitForReplicas *RetryParams, gr schema.GroupResource) error {
|
||||
if retry == nil {
|
||||
// make it try only once, immediately
|
||||
retry = &RetryParams{Interval: time.Millisecond, Timeout: time.Millisecond}
|
||||
}
|
||||
cond := ScaleCondition(s, preconditions, namespace, resourceName, newSize, nil, gr)
|
||||
if err := wait.PollImmediate(retry.Interval, retry.Timeout, cond); err != nil {
|
||||
return err
|
||||
}
|
||||
if waitForReplicas != nil {
|
||||
return WaitForScaleHasDesiredReplicas(s.scaleNamespacer, gr, resourceName, namespace, newSize, waitForReplicas)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// scaleHasDesiredReplicas returns a condition that will be true if and only if the desired replica
|
||||
// count for a scale (Spec) equals its updated replicas count (Status)
|
||||
func scaleHasDesiredReplicas(sClient scaleclient.ScalesGetter, gr schema.GroupResource, resourceName string, namespace string, desiredReplicas int32) wait.ConditionFunc {
|
||||
return func() (bool, error) {
|
||||
actualScale, err := sClient.Scales(namespace).Get(gr, resourceName)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
// this means the desired scale target has been reset by something else
|
||||
if actualScale.Spec.Replicas != desiredReplicas {
|
||||
return true, nil
|
||||
}
|
||||
return actualScale.Spec.Replicas == actualScale.Status.Replicas &&
|
||||
desiredReplicas == actualScale.Status.Replicas, nil
|
||||
}
|
||||
}
|
||||
|
||||
// WaitForScaleHasDesiredReplicas waits until condition scaleHasDesiredReplicas is satisfied
|
||||
// or returns error when timeout happens
|
||||
func WaitForScaleHasDesiredReplicas(sClient scaleclient.ScalesGetter, gr schema.GroupResource, resourceName string, namespace string, newSize uint, waitForReplicas *RetryParams) error {
|
||||
if waitForReplicas == nil {
|
||||
return fmt.Errorf("waitForReplicas parameter cannot be nil")
|
||||
}
|
||||
err := wait.PollImmediate(
|
||||
waitForReplicas.Interval,
|
||||
waitForReplicas.Timeout,
|
||||
scaleHasDesiredReplicas(sClient, gr, resourceName, namespace, int32(newSize)))
|
||||
if err == wait.ErrWaitTimeout {
|
||||
return fmt.Errorf("timed out waiting for %q to be synced", resourceName)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
|
@ -0,0 +1,683 @@
|
|||
/*
|
||||
Copyright 2014 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package scale
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
autoscalingv1 "k8s.io/api/autoscaling/v1"
|
||||
kerrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
api "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/client-go/scale"
|
||||
fakescale "k8s.io/client-go/scale/fake"
|
||||
testcore "k8s.io/client-go/testing"
|
||||
)
|
||||
|
||||
func TestReplicationControllerScaleRetry(t *testing.T) {
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewConflict(api.Resource("Status"), "foo", nil),
|
||||
}
|
||||
scaleClientExpectedAction := []string{"get", "update", "get"}
|
||||
scaleClient := createFakeScaleClient("replicationcontrollers", "foo-v1", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo-v1"
|
||||
namespace := metav1.NamespaceDefault
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, &preconditions, namespace, name, count, nil, schema.GroupResource{Group: "", Resource: "replicationcontrollers"})
|
||||
pass, err := scaleFunc()
|
||||
if pass {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err != nil {
|
||||
t.Errorf("Did not expect an error on update conflict failure, got %v", err)
|
||||
}
|
||||
preconditions = ScalePrecondition{3, ""}
|
||||
scaleFunc = ScaleCondition(scaler, &preconditions, namespace, name, count, nil, schema.GroupResource{Group: "", Resource: "replicationcontrollers"})
|
||||
pass, err = scaleFunc()
|
||||
if err == nil {
|
||||
t.Errorf("Expected error on precondition failure")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicationControllerScaleInvalid(t *testing.T) {
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewInvalid(api.Kind("Status"), "foo", nil),
|
||||
}
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
scaleClient := createFakeScaleClient("replicationcontrollers", "foo-v1", 1, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo-v1"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, &preconditions, namespace, name, count, nil, schema.GroupResource{Group: "", Resource: "replicationcontrollers"})
|
||||
pass, err := scaleFunc()
|
||||
if pass {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err == nil {
|
||||
t.Errorf("Expected error on invalid update failure, got %v", err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicationControllerScale(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
scaleClient := createFakeScaleClient("replicationcontrollers", "foo-v1", 2, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo-v1"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "", Resource: "replicationcontrollers"})
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error occurred = %v while scaling the resource", err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicationControllerScaleFailsPreconditions(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get"}
|
||||
scaleClient := createFakeScaleClient("replicationcontrollers", "foo", 10, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{2, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "", Resource: "replicationcontrollers"})
|
||||
if err == nil {
|
||||
t.Fatal("expected to get an error but none was returned")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeploymentScaleRetry(t *testing.T) {
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewConflict(api.Resource("Status"), "foo", nil),
|
||||
}
|
||||
scaleClientExpectedAction := []string{"get", "update", "get"}
|
||||
scaleClient := createFakeScaleClient("deployments", "foo", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := &ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, preconditions, namespace, name, count, nil, schema.GroupResource{Group: "apps", Resource: "deployments"})
|
||||
pass, err := scaleFunc()
|
||||
if pass != false {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err != nil {
|
||||
t.Errorf("Did not expect an error on update failure, got %v", err)
|
||||
}
|
||||
preconditions = &ScalePrecondition{3, ""}
|
||||
scaleFunc = ScaleCondition(scaler, preconditions, namespace, name, count, nil, schema.GroupResource{Group: "apps", Resource: "deployments"})
|
||||
pass, err = scaleFunc()
|
||||
if err == nil {
|
||||
t.Error("Expected error on precondition failure")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeploymentScale(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
scaleClient := createFakeScaleClient("deployments", "foo", 2, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "apps", Resource: "deployments"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeploymentScaleInvalid(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewInvalid(api.Kind("Status"), "foo", nil),
|
||||
}
|
||||
scaleClient := createFakeScaleClient("deployments", "foo", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, &preconditions, namespace, name, count, nil, schema.GroupResource{Group: "apps", Resource: "deployments"})
|
||||
pass, err := scaleFunc()
|
||||
if pass {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err == nil {
|
||||
t.Errorf("Expected error on invalid update failure, got %v", err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeploymentScaleFailsPreconditions(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get"}
|
||||
scaleClient := createFakeScaleClient("deployments", "foo", 10, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{2, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "apps", Resource: "deployments"})
|
||||
if err == nil {
|
||||
t.Fatal("exptected to get an error but none was returned")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStatefulSetScale(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
scaleClient := createFakeScaleClient("statefulsets", "foo", 2, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "apps", Resource: "statefulset"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStatefulSetScaleRetry(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update", "get"}
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewConflict(api.Resource("Status"), "foo", nil),
|
||||
}
|
||||
scaleClient := createFakeScaleClient("statefulsets", "foo", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := &ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, preconditions, namespace, name, count, nil, schema.GroupResource{Group: "apps", Resource: "statefulsets"})
|
||||
pass, err := scaleFunc()
|
||||
if pass != false {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err != nil {
|
||||
t.Errorf("Did not expect an error on update failure, got %v", err)
|
||||
}
|
||||
preconditions = &ScalePrecondition{3, ""}
|
||||
scaleFunc = ScaleCondition(scaler, preconditions, namespace, name, count, nil, schema.GroupResource{Group: "apps", Resource: "statefulsets"})
|
||||
pass, err = scaleFunc()
|
||||
if err == nil {
|
||||
t.Error("Expected error on precondition failure")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStatefulSetScaleInvalid(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewInvalid(api.Kind("Status"), "foo", nil),
|
||||
}
|
||||
scaleClient := createFakeScaleClient("statefulsets", "foo", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, &preconditions, namespace, name, count, nil, schema.GroupResource{Group: "apps", Resource: "statefulsets"})
|
||||
pass, err := scaleFunc()
|
||||
if pass {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err == nil {
|
||||
t.Errorf("Expected error on invalid update failure, got %v", err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStatefulSetScaleFailsPreconditions(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get"}
|
||||
scaleClient := createFakeScaleClient("statefulsets", "foo", 10, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{2, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "apps", Resource: "statefulsets"})
|
||||
if err == nil {
|
||||
t.Fatal("expected to get an error but none was returned")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicaSetScale(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
scaleClient := createFakeScaleClient("replicasets", "foo", 10, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "extensions", Resource: "replicasets"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicaSetScaleRetry(t *testing.T) {
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewConflict(api.Resource("Status"), "foo", nil),
|
||||
}
|
||||
scaleClientExpectedAction := []string{"get", "update", "get"}
|
||||
scaleClient := createFakeScaleClient("replicasets", "foo", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := &ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, preconditions, namespace, name, count, nil, schema.GroupResource{Group: "extensions", Resource: "replicasets"})
|
||||
pass, err := scaleFunc()
|
||||
if pass != false {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err != nil {
|
||||
t.Errorf("Did not expect an error on update failure, got %v", err)
|
||||
}
|
||||
preconditions = &ScalePrecondition{3, ""}
|
||||
scaleFunc = ScaleCondition(scaler, preconditions, namespace, name, count, nil, schema.GroupResource{Group: "extensions", Resource: "replicasets"})
|
||||
pass, err = scaleFunc()
|
||||
if err == nil {
|
||||
t.Error("Expected error on precondition failure")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicaSetScaleInvalid(t *testing.T) {
|
||||
verbsOnError := map[string]*kerrors.StatusError{
|
||||
"update": kerrors.NewInvalid(api.Kind("Status"), "foo", nil),
|
||||
}
|
||||
scaleClientExpectedAction := []string{"get", "update"}
|
||||
scaleClient := createFakeScaleClient("replicasets", "foo", 2, verbsOnError)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{-1, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
namespace := "default"
|
||||
|
||||
scaleFunc := ScaleCondition(scaler, &preconditions, namespace, name, count, nil, schema.GroupResource{Group: "extensions", Resource: "replicasets"})
|
||||
pass, err := scaleFunc()
|
||||
if pass {
|
||||
t.Errorf("Expected an update failure to return pass = false, got pass = %v", pass)
|
||||
}
|
||||
if err == nil {
|
||||
t.Errorf("Expected error on invalid update failure, got %v", err)
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplicaSetsGetterFailsPreconditions(t *testing.T) {
|
||||
scaleClientExpectedAction := []string{"get"}
|
||||
scaleClient := createFakeScaleClient("replicasets", "foo", 10, nil)
|
||||
scaler := NewScaler(scaleClient)
|
||||
preconditions := ScalePrecondition{2, ""}
|
||||
count := uint(3)
|
||||
name := "foo"
|
||||
err := scaler.Scale("default", name, count, &preconditions, nil, nil, schema.GroupResource{Group: "extensions", Resource: "replicasets"})
|
||||
if err == nil {
|
||||
t.Fatal("expected to get an error but non was returned")
|
||||
}
|
||||
actions := scaleClient.Actions()
|
||||
if len(actions) != len(scaleClientExpectedAction) {
|
||||
t.Errorf("unexpected actions: %v, expected %d actions got %d", actions, len(scaleClientExpectedAction), len(actions))
|
||||
}
|
||||
for i, verb := range scaleClientExpectedAction {
|
||||
if actions[i].GetVerb() != verb {
|
||||
t.Errorf("unexpected action: %+v, expected %s", actions[i].GetVerb(), verb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TestGenericScaleSimple exercises GenericScaler.ScaleSimple method
|
||||
func TestGenericScaleSimple(t *testing.T) {
|
||||
// test data
|
||||
scaleClient := createFakeScaleClient("deployments", "abc", 10, nil)
|
||||
|
||||
// test scenarios
|
||||
scenarios := []struct {
|
||||
name string
|
||||
precondition ScalePrecondition
|
||||
newSize int
|
||||
targetGR schema.GroupResource
|
||||
resName string
|
||||
scaleGetter scale.ScalesGetter
|
||||
expectError bool
|
||||
}{
|
||||
// scenario 1: scale up the "abc" deployment
|
||||
{
|
||||
name: "scale up the \"abc\" deployment",
|
||||
precondition: ScalePrecondition{10, ""},
|
||||
newSize: 20,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
},
|
||||
// scenario 2: scale down the "abc" deployment
|
||||
{
|
||||
name: "scale down the \"abs\" deployment",
|
||||
precondition: ScalePrecondition{20, ""},
|
||||
newSize: 5,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
},
|
||||
// scenario 3: precondition error, expected size is 1,
|
||||
// note that the previous scenario (2) set the size to 5
|
||||
{
|
||||
name: "precondition error, expected size is 1",
|
||||
precondition: ScalePrecondition{1, ""},
|
||||
newSize: 5,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
expectError: true,
|
||||
},
|
||||
// scenario 4: precondition is not validated when the precondition size is set to -1
|
||||
{
|
||||
name: "precondition is not validated when the size is set to -1",
|
||||
precondition: ScalePrecondition{-1, ""},
|
||||
newSize: 5,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
},
|
||||
// scenario 5: precondition error, resource version mismatch
|
||||
{
|
||||
name: "precondition error, resource version mismatch",
|
||||
precondition: ScalePrecondition{5, "v1"},
|
||||
newSize: 5,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
expectError: true,
|
||||
},
|
||||
}
|
||||
|
||||
// act
|
||||
for index, scenario := range scenarios {
|
||||
t.Run(fmt.Sprintf("running scenario %d: %s", index+1, scenario.name), func(t *testing.T) {
|
||||
target := NewScaler(scenario.scaleGetter)
|
||||
|
||||
resVersion, err := target.ScaleSimple("default", scenario.resName, &scenario.precondition, uint(scenario.newSize), scenario.targetGR)
|
||||
|
||||
if scenario.expectError && err == nil {
|
||||
t.Fatal("expected an error but was not returned")
|
||||
}
|
||||
if !scenario.expectError && err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if resVersion != "" {
|
||||
t.Fatalf("unexpected resource version returned = %s, wanted = %s", resVersion, "")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestGenericScale exercises GenericScaler.Scale method
|
||||
func TestGenericScale(t *testing.T) {
|
||||
// test data
|
||||
scaleClient := createFakeScaleClient("deployments", "abc", 10, nil)
|
||||
|
||||
// test scenarios
|
||||
scenarios := []struct {
|
||||
name string
|
||||
precondition ScalePrecondition
|
||||
newSize int
|
||||
targetGR schema.GroupResource
|
||||
resName string
|
||||
scaleGetter scale.ScalesGetter
|
||||
waitForReplicas *RetryParams
|
||||
expectError bool
|
||||
}{
|
||||
// scenario 1: scale up the "abc" deployment
|
||||
{
|
||||
name: "scale up the \"abc\" deployment",
|
||||
precondition: ScalePrecondition{10, ""},
|
||||
newSize: 20,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
},
|
||||
//scenario 2: a resource name cannot be empty
|
||||
{
|
||||
name: "a resource name cannot be empty",
|
||||
precondition: ScalePrecondition{10, ""},
|
||||
newSize: 20,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "",
|
||||
scaleGetter: scaleClient,
|
||||
expectError: true,
|
||||
},
|
||||
// scenario 3: wait for replicas error due to status.Replicas != spec.Replicas
|
||||
{
|
||||
name: "wait for replicas error due to status.Replicas != spec.Replicas",
|
||||
precondition: ScalePrecondition{10, ""},
|
||||
newSize: 20,
|
||||
targetGR: schema.GroupResource{Group: "apps", Resource: "deployments"},
|
||||
resName: "abc",
|
||||
scaleGetter: scaleClient,
|
||||
waitForReplicas: &RetryParams{time.Duration(5 * time.Second), time.Duration(5 * time.Second)},
|
||||
expectError: true,
|
||||
},
|
||||
}
|
||||
|
||||
// act
|
||||
for _, scenario := range scenarios {
|
||||
t.Run(scenario.name, func(t *testing.T) {
|
||||
target := NewScaler(scenario.scaleGetter)
|
||||
|
||||
err := target.Scale("default", scenario.resName, uint(scenario.newSize), &scenario.precondition, nil, scenario.waitForReplicas, scenario.targetGR)
|
||||
|
||||
if scenario.expectError && err == nil {
|
||||
t.Fatal("expected an error but was not returned")
|
||||
}
|
||||
if !scenario.expectError && err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func createFakeScaleClient(resource string, resourceName string, replicas int, errorsOnVerb map[string]*kerrors.StatusError) *fakescale.FakeScaleClient {
|
||||
shouldReturnAnError := func(verb string) (*kerrors.StatusError, bool) {
|
||||
if anError, anErrorExists := errorsOnVerb[verb]; anErrorExists {
|
||||
return anError, true
|
||||
}
|
||||
return &kerrors.StatusError{}, false
|
||||
}
|
||||
newReplicas := int32(replicas)
|
||||
scaleClient := &fakescale.FakeScaleClient{}
|
||||
scaleClient.AddReactor("get", resource, func(rawAction testcore.Action) (handled bool, ret runtime.Object, err error) {
|
||||
action := rawAction.(testcore.GetAction)
|
||||
if action.GetName() != resourceName {
|
||||
return true, nil, fmt.Errorf("expected = %s, got = %s", resourceName, action.GetName())
|
||||
}
|
||||
if anError, should := shouldReturnAnError("get"); should {
|
||||
return true, nil, anError
|
||||
}
|
||||
obj := &autoscalingv1.Scale{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: action.GetName(),
|
||||
Namespace: action.GetNamespace(),
|
||||
},
|
||||
Spec: autoscalingv1.ScaleSpec{
|
||||
Replicas: newReplicas,
|
||||
},
|
||||
}
|
||||
return true, obj, nil
|
||||
})
|
||||
scaleClient.AddReactor("update", resource, func(rawAction testcore.Action) (handled bool, ret runtime.Object, err error) {
|
||||
action := rawAction.(testcore.UpdateAction)
|
||||
obj := action.GetObject().(*autoscalingv1.Scale)
|
||||
if obj.Name != resourceName {
|
||||
return true, nil, fmt.Errorf("expected = %s, got = %s", resourceName, obj.Name)
|
||||
}
|
||||
if anError, should := shouldReturnAnError("update"); should {
|
||||
return true, nil, anError
|
||||
}
|
||||
newReplicas = obj.Spec.Replicas
|
||||
return true, &autoscalingv1.Scale{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: obj.Name,
|
||||
Namespace: action.GetNamespace(),
|
||||
},
|
||||
Spec: autoscalingv1.ScaleSpec{
|
||||
Replicas: newReplicas,
|
||||
},
|
||||
}, nil
|
||||
})
|
||||
return scaleClient
|
||||
}
|
||||
Loading…
Reference in New Issue