Merge branch 'master' into dependabot/go_modules/sigs.k8s.io/controll…

…er-runtime-0.16.3

.github/workflows/tag.yml

@@ -9,7 +9,7 @@ jobs:
   bump-tag:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
       pull-requests: write
     outputs:
       new_version: ${{ steps.bump-semver.outputs.new_version }}

api/v1beta1/spannerautoscaler_types.go

@@ -108,6 +108,14 @@ type ScaleConfig struct {
 	// The cool down period between two consecutive scaledown operations. If this option is omitted, the value of the `--scale-down-interval` command line option is taken as the default value.
 	ScaledownInterval *metav1.Duration `json:"scaledownInterval,omitempty"`
 
+	// The maximum number of processing units which can be added in one scale-up operation. It can be a multiple of 100 for values < 1000, or a multiple of 1000 otherwise.
+	// +kubebuilder:default=0
+	ScaleupStepSize int `json:"scaleupStepSize,omitempty"`
+
+	// How often autoscaler is reevaluated for scale up.
+	// The warm up period between two consecutive scaleup operations. If this option is omitted, the value of the `--scale-up-interval` command line option is taken as the default value.
+	ScaleupInterval *metav1.Duration `json:"scaleupInterval,omitempty"`
+
 	// The CPU utilization which the autoscaling will try to achieve. Ref: [Spanner CPU utilization](https://cloud.google.com/spanner/docs/cpu-utilization#task-priority)
 	TargetCPUUtilization TargetCPUUtilization `json:"targetCPUUtilization"`
 }

api/v1beta1/spannerautoscaler_webhook.go

@@ -200,6 +200,18 @@ func (r *SpannerAutoscaler) validateScaleConfig() *field.Error {
 			"must be a multiple of 100 for values which are less than 1000")
 	}
 
+	if sc.ScaleupStepSize > 1000 && sc.ScaleupStepSize%1000 != 0 {
+		return field.Invalid(
+			field.NewPath("spec").Child("scaleConfig").Child("scaleupStepSize"),
+			sc.ScaleupStepSize,
+			"must be a multiple of 1000 for values which are greater than 1000")
+	} else if sc.ScaleupStepSize < 1000 && sc.ScaleupStepSize%100 != 0 {
+		return field.Invalid(
+			field.NewPath("spec").Child("scaleConfig").Child("scaleupStepSize"),
+			sc.ScaleupStepSize,
+			"must be a multiple of 100 for values which are less than 1000")
+	}
+
 	return nil
 }
 

cmd/main.go

@@ -60,6 +60,7 @@ var (
 	enableLeaderElection = flag.Bool("leader-elect", false, "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.")
 	leaderElectionID     = flag.String("leader-elect-id", "", "Lease name for leader election.")
 	scaleDownInterval    = flag.Duration("scale-down-interval", 55*time.Minute, "The scale down interval.")
+	scaleUpInterval      = flag.Duration("scale-up-interval", 60*time.Second, "The scale up interval.")
 	configFile           = flag.String("config", "", "The controller will load its initial configuration from this file. "+
 		"Omit this flag to use the default configuration values. Command-line flags override configuration from this file.")
 )
@@ -87,6 +88,7 @@ func main() {
 		"metricsAddr", metricsAddr,
 		"probeAddr", probeAddr,
 		"scaleDownInterval", scaleDownInterval,
+		"scaleUpInterval", scaleUpInterval,
 	)
 
 	cfg, err := config.GetConfig()
@@ -139,6 +141,7 @@ func main() {
 		log,
 		controller.WithLog(log),
 		controller.WithScaleDownInterval(*scaleDownInterval),
+		controller.WithScaleUpInterval(*scaleUpInterval),
 	)
 	if err := sar.SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "SpannerAutoscaler")

config/crd/bases/spanner.mercari.com_spannerautoscalers.yaml

@@ -361,6 +361,18 @@ spec:
                       be deleted in one scale-down operation. It can be a multiple
                       of 100 for values < 1000, or a multiple of 1000 otherwise.
                     type: integer
+                  scaleupInterval:
+                    description: How often autoscaler is reevaluated for scale up.
+                      The warm up period between two consecutive scaleup operations.
+                      If this option is omitted, the value of the `--scale-up-interval`
+                      command line option is taken as the default value.
+                    type: string
+                  scaleupStepSize:
+                    default: 0
+                    description: The maximum number of processing units which can
+                      be added in one scale-up operation. It can be a multiple of
+                      100 for values < 1000, or a multiple of 1000 otherwise.
+                    type: integer
                   targetCPUUtilization:
                     description: 'The CPU utilization which the autoscaling will try
                       to achieve. Ref: [Spanner CPU utilization](https://cloud.google.com/spanner/docs/cpu-utilization#task-priority)'

docs/crd-reference.md

@@ -92,7 +92,9 @@ _Appears in:_
 | `nodes` _[ScaleConfigNodes](#scaleconfignodes)_ | If `nodes` are provided at the time of resource creation, then they are automatically converted to `processing-units`. So it is recommended to use only the processing units. Ref: [Spanner Compute Capacity](https://cloud.google.com/spanner/docs/compute-capacity#compute_capacity) |
 | `processingUnits` _[ScaleConfigPUs](#scaleconfigpus)_ | ProcessingUnits for scaling of the Spanner instance. Ref: [Spanner Compute Capacity](https://cloud.google.com/spanner/docs/compute-capacity#compute_capacity) |
 | `scaledownStepSize` _integer_ | The maximum number of processing units which can be deleted in one scale-down operation. It can be a multiple of 100 for values < 1000, or a multiple of 1000 otherwise. |
-| `scaledownInterval` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#duration-v1-meta)_ | How often autoscaler is reevaluated for scale down. The cool down period between two consecutive scaledown operations. If this option is omitted, the value of the `--scale-down-interval` command line option is taken as the default value. |
+| `scaledownInterval` _Duration_ | How often autoscaler is reevaluated for scale down. The cool down period between two consecutive scaledown operations. If this option is omitted, the value of the `--scale-down-interval` command line option is taken as the default value. Duration string is a possibly sequence of decimal numbers, each with unit suffix, such as "300m", "1.5h" or "2h45m". |
+| `scaleupStepSize` _integer_ | The maximum number of processing units which can be added in one scale-up operation. It can be a multiple of 100 for values < 1000, or a multiple of 1000 otherwise. |
+| `scaleupInterval` _Duration_ | How often autoscaler is reevaluated for scale up. The warm up period between two consecutive scaleup operations. If this option is omitted, the value of the `--scale-up-interval` command line option is taken as the default value. Duration string is a possibly sequence of decimal numbers, each with unit suffix, such as "300m", "1.5h" or "2h45m". |
 | `targetCPUUtilization` _[TargetCPUUtilization](#targetcpuutilization)_ | The CPU utilization which the autoscaling will try to achieve. Ref: [Spanner CPU utilization](https://cloud.google.com/spanner/docs/cpu-utilization#task-priority) |
 
 

internal/controller/spannerautoscaler_controller.go

@@ -65,6 +65,7 @@ type SpannerAutoscalerReconciler struct {
 	schedulers map[types.NamespacedName]schedulerpkg.Scheduler
 
 	scaleDownInterval time.Duration
+	scaleUpInterval   time.Duration
 
 	clock utilclock.Clock
 	log   logr.Logger
@@ -147,6 +148,19 @@ func (o withScaleDownInterval) applySpannerAutoscalerReconciler(r *SpannerAutosc
 	r.scaleDownInterval = o.scaleDownInterval
 }
 
+// Add scale-up-interval option for the autoscaler-reconciler
+func WithScaleUpInterval(scaleUpInterval time.Duration) Option {
+	return withScaleUpInterval{scaleUpInterval: scaleUpInterval}
+}
+
+type withScaleUpInterval struct {
+	scaleUpInterval time.Duration
+}
+
+func (o withScaleUpInterval) applySpannerAutoscalerReconciler(r *SpannerAutoscalerReconciler) {
+	r.scaleUpInterval = o.scaleUpInterval
+}
+
 // NewSpannerAutoscalerReconciler returns a new SpannerAutoscalerReconciler.
 func NewSpannerAutoscalerReconciler(
 	ctrlClient ctrlclient.Client,
@@ -165,6 +179,7 @@ func NewSpannerAutoscalerReconciler(
 		schedulers:        make(map[types.NamespacedName]schedulerpkg.Scheduler),
 		crons:             make(map[types.NamespacedName]*cronpkg.Cron),
 		scaleDownInterval: 55 * time.Minute,
+		scaleUpInterval:   60 * time.Second,
 		clock:             utilclock.RealClock{},
 		log:               logger,
 	}
@@ -485,7 +500,7 @@ func (r *SpannerAutoscalerReconciler) needUpdateProcessingUnits(log logr.Logger,
 		log.Info("no need to scale", "currentPU", currentProcessingUnits, "currentCPU", sa.Status.CurrentHighPriorityCPUUtilization)
 		return false
 
-	case desiredProcessingUnits > currentProcessingUnits && r.clock.Now().Before(sa.Status.LastScaleTime.Time.Add(10*time.Second)):
+	case currentProcessingUnits < desiredProcessingUnits && r.clock.Now().Before(sa.Status.LastScaleTime.Time.Add(getOrConvertTimeDuration(sa.Spec.ScaleConfig.ScaleupInterval, r.scaleUpInterval))):
 		log.Info("too short to scale up since last scale-up event",
 			"timeGap", now.Sub(sa.Status.LastScaleTime.Time).String(),
 			"now", now.String(),
@@ -532,18 +547,35 @@ func calcDesiredProcessingUnits(sa spannerv1beta1.SpannerAutoscaler) int {
 	}
 
 	sdStepSize := sa.Spec.ScaleConfig.ScaledownStepSize
+	suStepSize := sa.Spec.ScaleConfig.ScaleupStepSize
 
 	// round up the scaledownStepSize to avoid intermediate values
 	// for example: 8000 -> 7000 instead of 8000 -> 7400
 	if sdStepSize < 1000 && sa.Status.CurrentProcessingUnits > 1000 {
 		sdStepSize = 1000
 	}
 
+	// round up the scaleupStepSize to avoid intermediate values
+	// for example: 7000 -> 8000 instead of 7000 -> 7600
+	// To keep compatibility, check if scaleupStepSize is not 0
+	if suStepSize != 0 && suStepSize < 1000 && sa.Status.CurrentProcessingUnits+suStepSize > 1000 {
+		suStepSize = 1000
+	}
+
 	// in case of scaling down, check that we don't scale down beyond the ScaledownStepSize
 	if scaledDownPU := (sa.Status.CurrentProcessingUnits - sdStepSize); desiredPU < scaledDownPU {
 		desiredPU = scaledDownPU
 	}
 
+	// in case of scaling up, check that we don't scale up beyond the ScaleupStepSize
+	if scaledUpPU := (sa.Status.CurrentProcessingUnits + suStepSize); suStepSize != 0 && scaledUpPU < desiredPU {
+		desiredPU = scaledUpPU
+
+		if 1000 < desiredPU && desiredPU%1000 != 0 {
+			desiredPU = ((desiredPU / 1000) + 1) * 1000
+		}
+	}
+
 	// keep the scaling between the specified min/max range
 	minPU := sa.Spec.ScaleConfig.ProcessingUnits.Min
 	maxPU := sa.Spec.ScaleConfig.ProcessingUnits.Max