f

api/core/v1/pod_webhook.go

@@ -103,11 +103,42 @@ func (h *PodWebhook) Default(ctx context.Context, obj runtime.Object) error {
 		return nil
 	}
 
-	for i := range pod.Spec.Containers {
-		container := &pod.Spec.Containers[i]
+	newRequestsMap := map[containerNameAndResource]resource.Quantity{}
+	oldRequestsMap := map[containerNameAndResource]resource.Quantity{}
+
+	// Update resource requests based on the tortoise.Status.Conditions.ContainerResourceRequests
+	for i, container := range pod.Spec.Containers {
+		for k, oldReq := range container.Resources.Requests {
+			oldRequestsMap[containerNameAndResource{containerName: container.Name, resourceName: k}] = oldReq
+
+			newReq, ok := getRequestFromTortoise(t, container.Name, k)
+			if !ok {
+				newRequestsMap[containerNameAndResource{containerName: container.Name, resourceName: k}] = oldReq
+				continue
+			}
+			pod.Spec.Containers[i].Resources.Requests[k] = newReq
+		}
+	}
+
+	// Update resource limits
+	for i, container := range pod.Spec.Containers {
 		if container.Resources.Limits == nil {
 			container.Resources.Limits = make(v1.ResourceList)
 		}
+
+		for k, oldLimit := range container.Resources.Limits {
+			// Keeping limit proportional to request
+			// The container template specifies resource request for 500 milli CPU and 1 GB of RAM. The template also specifies resource limit of 2 GB RAM.
+			// VPA recommendation is 1000 milli CPU and 2 GB of RAM. When VPA applies the recommendation, it will also set the memory limit to 4 GB.
+
+			key := containerNameAndResource{containerName: container.Name, resourceName: k}
+			oldReq := oldRequestsMap[key]
+			oldRatio := float64(oldLimit.MilliValue()) / float64(oldReq.MilliValue())
+			newReq := newRequestsMap[key]
+			newLim := resource.NewMilliQuantity(int64(float64(newReq.MilliValue())*oldRatio), oldReq.Format)
+			pod.Spec.Containers[i].Resources.Limits[k] = *newLim
+		}
+
 		for k := range container.Resources.Requests {
 			if _, ok := h.resourceLimitMultiplier[string(k)]; !ok {
 				continue
@@ -118,9 +149,26 @@ func (h *PodWebhook) Default(ctx context.Context, obj runtime.Object) error {
 			if k == v1.ResourceCPU && newLimit.Cmp(h.minimumCPULimit) < 0 {
 				newLimit = ptr.To(h.minimumCPULimit.DeepCopy())
 			}
-			container.Resources.Limits[k] = ptr.Deref(newLimit, container.Resources.Limits[k])
+
+			pod.Spec.Containers[i].Resources.Limits[k] = ptr.Deref(newLimit, container.Resources.Limits[k])
 		}
 	}
 
 	return nil
 }
+
+type containerNameAndResource struct {
+	containerName string
+	resourceName  v1.ResourceName
+}
+
+// getRequestFromTortoise returns the resource request from the tortoise.Status.Conditions.ContainerResourceRequests.
+func getRequestFromTortoise(t *v1beta3.Tortoise, containerName string, resourceName v1.ResourceName) (resource.Quantity, bool) {
+	for _, req := range t.Status.Conditions.ContainerResourceRequests {
+		if req.ContainerName == containerName {
+			return req.Resource[resourceName], true
+		}
+	}
+
+	return resource.Quantity{}, false
+}

api/v1beta3/tortoise_types.go

@@ -250,7 +250,6 @@ type TargetStatusVerticalPodAutoscaler struct {
 type VerticalPodAutoscalerRole string
 
 const (
-	VerticalPodAutoscalerRoleUpdater = "Updater"
 	VerticalPodAutoscalerRoleMonitor = "Monitor"
 )
 
@@ -328,7 +327,10 @@ type Conditions struct {
 	// ContainerRecommendationFromVPA is the condition of container recommendation from VPA, which is observed last time.
 	// +optional
 	ContainerRecommendationFromVPA []ContainerRecommendationFromVPA `json:"containerRecommendationFromVPA,omitempty" protobuf:"bytes,2,opt,name=containerRecommendationFromVPA"`
-	// ContainerResourceRequests has the last observed resource request of each container.
+	// ContainerResourceRequests has the ideal resource request for each container.
+	// If the mode is Off, it should be the same value as the current resource request.
+	// If the mode is Auto, it would basically be the same value as the recommendation.
+	// (Tortoise sometimes doesn't immediately apply the recommendation value to the resource request for the sake of safety.)
 	// +optional
 	ContainerResourceRequests []ContainerResourceRequests `json:"containerResourceRequests,omitempty" protobuf:"bytes,3,opt,name=containerResourceRequests"`
 }
@@ -346,6 +348,7 @@ const (
 	// TortoiseConditionTypeFailedToReconcile means tortoise failed to reconcile due to some reasons.
 	TortoiseConditionTypeFailedToReconcile                   TortoiseConditionType = "FailedToReconcile"
 	TortoiseConditionTypeHPATargetUtilizationUpdated         TortoiseConditionType = "HPATargetUtilizationUpdated"
+	TortoiseConditionTypeVerticalRecommendationUpdated       TortoiseConditionType = "VerticalRecommendationUpdated"
 	TortoiseConditionTypeScaledUpBasedOnPreferredMaxReplicas TortoiseConditionType = "ScaledUpBasedOnPreferredMaxReplicas"
 )
 

config/crd/bases/autoscaling.mercari.com_tortoises.yaml

@@ -276,8 +276,12 @@ spec:
                       type: object
                     type: array
                   containerResourceRequests:
-                    description: ContainerResourceRequests has the last observed resource
-                      request of each container.
+                    description: ContainerResourceRequests has the ideal resource
+                      request for each container. If the mode is Off, it should be
+                      the same value as the current resource request. If the mode
+                      is Auto, it would basically be the same value as the recommendation.
+                      (Tortoise sometimes doesn't immediately apply the recommendation
+                      value to the resource request for the sake of safety.)
                     items:
                       properties:
                         containerName:

controllers/testdata/deletion-no-delete/before/tortoise.yaml

@@ -77,8 +77,6 @@ status:
     deployment: ""
     horizontalPodAutoscaler: tortoise-hpa-mercari
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/deletion-policy-all/before/tortoise.yaml

@@ -76,8 +76,6 @@ status:
   targets:
     horizontalPodAutoscaler: tortoise-hpa-mercari
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml

@@ -74,6 +74,11 @@ status:
       reason: HPATargetUtilizationUpdated
       status: "True"
       type: HPATargetUtilizationUpdated
+    - lastTransitionTime: "2023-01-01T00:00:00Z"
+      lastUpdateTime: null
+      message: The recommendation is provided
+      status: "True"
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"
@@ -133,8 +138,6 @@ status:
       kind: ""
       name: ""
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml

@@ -75,8 +75,6 @@ status:
   targets:
     horizontalPodAutoscaler: tortoise-hpa-mercari
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml

@@ -74,6 +74,11 @@ status:
       reason: HPATargetUtilizationUpdated
       status: "True"
       type: HPATargetUtilizationUpdated
+    - lastTransitionTime: "2023-01-01T00:00:00Z"
+      lastUpdateTime: null
+      message: The recommendation is provided
+      status: "True"
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"
@@ -131,8 +136,6 @@ status:
       kind: ""
       name: ""
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml

@@ -80,8 +80,6 @@ status:
         containerName: istio-proxy
   targets:
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/tortoise.yaml

@@ -71,6 +71,11 @@ status:
         cpu: "3"
         memory: 3Gi
     tortoiseConditions:
+    - lastTransitionTime: "2023-01-01T00:00:00Z"
+      lastUpdateTime: null
+      message: The recommendation is provided
+      status: "True"
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"
@@ -127,8 +132,6 @@ status:
       kind: Deployment
       name: mercari-app
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/tortoise.yaml

@@ -88,8 +88,6 @@ status:
       name: mercari-app
     horizontalPodAutoscaler: tortoise-hpa-mercari
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml

@@ -70,6 +70,11 @@ status:
         cpu: "3"
         memory: 3Gi
     tortoiseConditions:
+    - lastTransitionTime: "2023-01-01T00:00:00Z"
+      lastUpdateTime: null
+      message: The recommendation is provided
+      status: "True"
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"
@@ -126,8 +131,6 @@ status:
       kind: Deployment
       name: mercari-app
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working

controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml

@@ -87,8 +87,6 @@ status:
       name: mercari-app
     horizontalPodAutoscaler: tortoise-hpa-mercari
     verticalPodAutoscalers:
-    - name: tortoise-updater-mercari
-      role: Updater
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working