support AutoscalingTypeOff in AutoscalingPolicy (#147)

mercari · Oct 4, 2023 · 92523fd · 92523fd
1 parent 076f925
commit 92523fd
Show file tree

Hide file tree

Showing 11 changed files with 1,132 additions and 86 deletions.
diff --git a/api/v1beta1/tortoise_types.go b/api/v1beta1/tortoise_types.go
@@ -80,7 +80,8 @@ type ContainerResourcePolicy struct {
 	// AutoscalingPolicy specifies how each resource is scaled.
 	// If "Horizontal", the resource is horizontally scaled.
 	// If "Vertical", the resource is vertically scaled.
-	// Now, at least one container in Pod should be Horizontal.
+	// If "Off", tortoise doesn't scale at all based on that resource.
+	// At least one container in Pod should be Horizontal.
 	//
 	// The default value is "Horizontal" for cpu, and "Vertical" for memory.
 	// +optional
@@ -104,10 +105,11 @@ const (
 	AutoUpdateMode      UpdateMode = "Auto"
 )
 
-// +kubebuilder:validation:Enum=Horizontal;Vertical
+// +kubebuilder:validation:Enum=Off;Horizontal;Vertical
 type AutoscalingType string
 
 const (
+	AutoscalingTypeOff        AutoscalingType = "Off"
 	AutoscalingTypeHorizontal AutoscalingType = "Horizontal"
 	AutoscalingTypeVertical   AutoscalingType = "Vertical"
 )
@@ -290,7 +292,7 @@ type TortoiseCondition struct {
 type ContainerRecommendationFromVPA struct {
 	// ContainerName is the name of target container.
 	ContainerName string `json:"containerName" protobuf:"bytes,1,name=containerName"`
-	// MaxRecommendation is the max recommendation value from VPA among certain period (1 week).
+	// MaxRecommendation is the max recommendation value from VPA in a certain period (1 week).
 	// Tortoise generates all recommendation based on this MaxRecommendation.
 	MaxRecommendation map[v1.ResourceName]ResourceQuantity `json:"maxRecommendation" protobuf:"bytes,2,name=maxRecommendation"`
 	// Recommendation is the latest recommendation value from VPA.

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/autoscaling.mercari.com_tortoises.yaml b/config/crd/bases/autoscaling.mercari.com_tortoises.yaml
@@ -404,14 +404,16 @@ spec:
                     autoscalingPolicy:
                       additionalProperties:
                         enum:
+                        - "Off"
                         - Horizontal
                         - Vertical
                         type: string
                       description: "AutoscalingPolicy specifies how each resource
                         is scaled. If \"Horizontal\", the resource is horizontally
                         scaled. If \"Vertical\", the resource is vertically scaled.
-                        Now, at least one container in Pod should be Horizontal. \n
-                        The default value is \"Horizontal\" for cpu, and \"Vertical\"
+                        If \"Off\", tortoise doesn't scale at all based on that resource.
+                        At least one container in Pod should be Horizontal. \n The
+                        default value is \"Horizontal\" for cpu, and \"Vertical\"
                         for memory."
                       type: object
                     containerName:
@@ -522,7 +524,7 @@ spec:
                                 type: string
                             type: object
                           description: MaxRecommendation is the max recommendation
-                            value from VPA among certain period (1 week). Tortoise
+                            value from VPA in a certain period (1 week). Tortoise
                             generates all recommendation based on this MaxRecommendation.
                           type: object
                         recommendation: