fix

mercari · Dec 25, 2024 · 8802f3b · 8802f3b
1 parent c076cc4
commit 8802f3b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 45 deletions.
diff --git a/.../controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml b/.../controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml
@@ -70,15 +70,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml
@@ -70,15 +70,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/...controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml b/...controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml
@@ -70,15 +70,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/...estdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml b/...estdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml
@@ -70,15 +70,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/...controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml b/...controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml
@@ -70,15 +70,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/...stdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml b/...stdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml
@@ -47,15 +47,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/...al/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml b/...al/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml
@@ -53,15 +53,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/...al/controller/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml b/...al/controller/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml
@@ -47,15 +47,15 @@ status:
       type: ScaledUpBasedOnPreferredMaxReplicas
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: HPA target utilization is updated
-      reason: HPATargetUtilizationUpdated
+      message: The recommendation is provided
       status: "True"
-      type: HPATargetUtilizationUpdated
+      type: VerticalRecommendationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: The recommendation is provided
+      message: HPA target utilization is updated
+      reason: HPATargetUtilizationUpdated
       status: "True"
-      type: VerticalRecommendationUpdated
+      type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
       status: "False"

diff --git a/internal/controller/tortoise_controller.go b/internal/controller/tortoise_controller.go
@@ -258,15 +258,15 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 		return ctrl.Result{RequeueAfter: r.Interval}, nil
 	}
 
-	_, tortoise, err = r.HpaService.UpdateHPAFromTortoiseRecommendation(ctx, tortoise, now)
+	tortoise, err = r.TortoiseService.UpdateResourceRequest(ctx, tortoise, currentDesiredReplicaNum, now)
 	if err != nil {
-		logger.Error(err, "update HPA based on the recommendation in tortoise", "tortoise", req.NamespacedName)
+		logger.Error(err, "update VPA based on the recommendation in tortoise", "tortoise", req.NamespacedName)
 		return ctrl.Result{}, err
 	}
 
-	tortoise, err = r.TortoiseService.UpdateResourceRequest(ctx, tortoise, currentDesiredReplicaNum, now)
+	_, tortoise, err = r.HpaService.UpdateHPAFromTortoiseRecommendation(ctx, tortoise, now)
 	if err != nil {
-		logger.Error(err, "update VPA based on the recommendation in tortoise", "tortoise", req.NamespacedName)
+		logger.Error(err, "update HPA based on the recommendation in tortoise", "tortoise", req.NamespacedName)
 		return ctrl.Result{}, err
 	}
 

diff --git a/pkg/hpa/service.go b/pkg/hpa/service.go
@@ -456,7 +456,7 @@ func (c *Service) ChangeHPAFromTortoiseRecommendation(tortoise *autoscalingv1bet
 					cpu += value.AsApproximateFloat64()
 				}
 				if resourcename == corev1.ResourceMemory {
-					cpu += value.AsApproximateFloat64()
+					mem += value.AsApproximateFloat64()
 				}
 			}
 		}