@@ -23,8 +23,8 @@ import (
2323
2424 autoscalingv1 "k8s.io/api/autoscaling/v1"
2525 "k8s.io/apimachinery/pkg/api/errors"
26- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726 "k8s.io/apimachinery/pkg/runtime/schema"
27+ "k8s.io/apimachinery/pkg/types"
2828 "k8s.io/apimachinery/pkg/util/wait"
2929 scaleclient "k8s.io/client-go/scale"
3030)
@@ -35,10 +35,10 @@ type Scaler interface {
3535 // retries in the event of resource version mismatch (if retry is not nil),
3636 // and optionally waits until the status of the resource matches newSize (if wait is not nil)
3737 // TODO: Make the implementation of this watch-based (#56075) once #31345 is fixed.
38- Scale (namespace , name string , newSize uint , preconditions * ScalePrecondition , retry , wait * RetryParams , gr schema.GroupResource ) error
38+ Scale (namespace , name string , newSize uint , preconditions * ScalePrecondition , retry , wait * RetryParams , gvr schema.GroupVersionResource ) error
3939 // ScaleSimple does a simple one-shot attempt at scaling - not useful on its own, but
4040 // a necessary building block for Scale
41- ScaleSimple (namespace , name string , preconditions * ScalePrecondition , newSize uint , gr schema.GroupResource ) (updatedResourceVersion string , err error )
41+ ScaleSimple (namespace , name string , preconditions * ScalePrecondition , newSize uint , gvr schema.GroupVersionResource ) (updatedResourceVersion string , err error )
4242}
4343
4444// NewScaler get a scaler for a given resource
@@ -77,9 +77,9 @@ func NewRetryParams(interval, timeout time.Duration) *RetryParams {
7777}
7878
7979// ScaleCondition is a closure around Scale that facilitates retries via util.wait
80- func ScaleCondition (r Scaler , precondition * ScalePrecondition , namespace , name string , count uint , updatedResourceVersion * string , gr schema.GroupResource ) wait.ConditionFunc {
80+ func ScaleCondition (r Scaler , precondition * ScalePrecondition , namespace , name string , count uint , updatedResourceVersion * string , gvr schema.GroupVersionResource ) wait.ConditionFunc {
8181 return func () (bool , error ) {
82- rv , err := r .ScaleSimple (namespace , name , precondition , count , gr )
82+ rv , err := r .ScaleSimple (namespace , name , precondition , count , gvr )
8383 if updatedResourceVersion != nil {
8484 * updatedResourceVersion = rv
8585 }
@@ -113,23 +113,25 @@ type genericScaler struct {
113113var _ Scaler = & genericScaler {}
114114
115115// ScaleSimple updates a scale of a given resource. It returns the resourceVersion of the scale if the update was successful.
116- func (s * genericScaler ) ScaleSimple (namespace , name string , preconditions * ScalePrecondition , newSize uint , gr schema.GroupResource ) (updatedResourceVersion string , err error ) {
117- scale := & autoscalingv1.Scale {
118- ObjectMeta : metav1.ObjectMeta {Namespace : namespace , Name : name },
119- }
116+ func (s * genericScaler ) ScaleSimple (namespace , name string , preconditions * ScalePrecondition , newSize uint , gvr schema.GroupVersionResource ) (updatedResourceVersion string , err error ) {
120117 if preconditions != nil {
121- var err error
122- scale , err = s .scaleNamespacer .Scales (namespace ).Get (gr , name )
118+ scale , err := s .scaleNamespacer .Scales (namespace ).Get (gvr .GroupResource (), name )
123119 if err != nil {
124120 return "" , err
125121 }
126- if err := preconditions .validate (scale ); err != nil {
122+ if err = preconditions .validate (scale ); err != nil {
123+ return "" , err
124+ }
125+ scale .Spec .Replicas = int32 (newSize )
126+ updatedScale , err := s .scaleNamespacer .Scales (namespace ).Update (gvr .GroupResource (), scale )
127+ if err != nil {
127128 return "" , err
128129 }
130+ return updatedScale .ResourceVersion , nil
129131 }
130132
131- scale . Spec . Replicas = int32 ( newSize )
132- updatedScale , err := s .scaleNamespacer .Scales (namespace ).Update ( gr , scale )
133+ patch := [] byte ( fmt . Sprintf ( `{"spec":{"replicas":%d}}` , newSize ) )
134+ updatedScale , err := s .scaleNamespacer .Scales (namespace ).Patch ( gvr , name , types . MergePatchType , patch )
133135 if err != nil {
134136 return "" , err
135137 }
@@ -138,17 +140,17 @@ func (s *genericScaler) ScaleSimple(namespace, name string, preconditions *Scale
138140
139141// Scale updates a scale of a given resource to a new size, with optional precondition check (if preconditions is not nil),
140142// optional retries (if retry is not nil), and then optionally waits for the status to reach desired count.
141- func (s * genericScaler ) Scale (namespace , resourceName string , newSize uint , preconditions * ScalePrecondition , retry , waitForReplicas * RetryParams , gr schema.GroupResource ) error {
143+ func (s * genericScaler ) Scale (namespace , resourceName string , newSize uint , preconditions * ScalePrecondition , retry , waitForReplicas * RetryParams , gvr schema.GroupVersionResource ) error {
142144 if retry == nil {
143145 // make it try only once, immediately
144146 retry = & RetryParams {Interval : time .Millisecond , Timeout : time .Millisecond }
145147 }
146- cond := ScaleCondition (s , preconditions , namespace , resourceName , newSize , nil , gr )
148+ cond := ScaleCondition (s , preconditions , namespace , resourceName , newSize , nil , gvr )
147149 if err := wait .PollImmediate (retry .Interval , retry .Timeout , cond ); err != nil {
148150 return err
149151 }
150152 if waitForReplicas != nil {
151- return WaitForScaleHasDesiredReplicas (s .scaleNamespacer , gr , resourceName , namespace , newSize , waitForReplicas )
153+ return WaitForScaleHasDesiredReplicas (s .scaleNamespacer , gvr . GroupResource () , resourceName , namespace , newSize , waitForReplicas )
152154 }
153155 return nil
154156}
0 commit comments