implement TortoiseHPATargetUtilizationUpdateInterval and HPATargetUti…

…lizationUpdated condition (#177)
mercari · Oct 12, 2023 · d40832b · d40832b
1 parent e5ef93a
commit d40832b
Show file tree

Hide file tree

Showing 41 changed files with 554 additions and 105 deletions.
diff --git a/api/autoscaling/v2/webhook_suite_test.go b/api/autoscaling/v2/webhook_suite_test.go
@@ -149,7 +149,7 @@ var _ = BeforeSuite(func() {
 	eventRecorder := mgr.GetEventRecorderFor("tortoise-controller")
 	tortoiseService, err := tortoise.New(mgr.GetClient(), eventRecorder, config.RangeOfMinMaxReplicasRecommendationHours, config.TimeZone, config.TortoiseUpdateInterval, config.MinMaxReplicasRecommendationType)
 	Expect(err).NotTo(HaveOccurred())
-	hpaService := hpa.New(mgr.GetClient(), eventRecorder, config.ReplicaReductionFactor, config.UpperTargetResourceUtilization, 100)
+	hpaService := hpa.New(mgr.GetClient(), eventRecorder, config.ReplicaReductionFactor, config.UpperTargetResourceUtilization, 100, time.Hour)
 	Expect(err).NotTo(HaveOccurred())
 
 	hpaWebhook := New(tortoiseService, hpaService)

diff --git a/api/v1beta2/tortoise_types.go b/api/v1beta2/tortoise_types.go
@@ -294,7 +294,8 @@ type TortoiseConditionType string
 
 const (
 	// TortoiseConditionTypeFailedToReconcile means tortoise failed to reconcile due to some reasons.
-	TortoiseConditionTypeFailedToReconcile TortoiseConditionType = "FailedToReconcile"
+	TortoiseConditionTypeFailedToReconcile           TortoiseConditionType = "FailedToReconcile"
+	TortoiseConditionTypeHPATargetUtilizationUpdated TortoiseConditionType = "HPATargetUtilizationUpdated"
 )
 
 type TortoiseCondition struct {

diff --git a/controllers/testdata/deletion-no-delete/before/tortoise.yaml b/controllers/testdata/deletion-no-delete/before/tortoise.yaml
@@ -50,7 +50,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/deletion-policy-all/before/tortoise.yaml b/controllers/testdata/deletion-policy-all/before/tortoise.yaml
@@ -50,7 +50,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml
@@ -18,6 +18,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -49,7 +54,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml
@@ -18,6 +18,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -49,7 +54,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...rollers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml b/...rollers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...llers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml b/...llers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...lers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml b/...lers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency/after/tortoise.yaml
@@ -19,6 +19,11 @@ spec:
   updateMode: Emergency
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -50,7 +55,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...rollers/testdata/reconcile-for-the-multiple-containers-pod-emergency/before/tortoise.yaml b/...rollers/testdata/reconcile-for-the-multiple-containers-pod-emergency/before/tortoise.yaml
@@ -50,7 +50,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml
@@ -18,6 +18,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -49,7 +54,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml
@@ -18,6 +18,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -49,7 +54,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml b/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml
@@ -49,7 +49,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml
@@ -31,7 +31,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml
@@ -31,7 +31,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-emergency/after/tortoise.yaml
@@ -15,6 +15,11 @@ spec:
   updateMode: Emergency
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -31,7 +36,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency/before/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-emergency/before/tortoise.yaml
@@ -31,7 +31,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

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
@@ -14,6 +14,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -30,7 +35,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...tdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml b/...tdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml
@@ -30,7 +30,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...ollers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml b/...ollers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml
@@ -30,7 +30,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...llers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml b/...llers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml
@@ -30,7 +30,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml
@@ -14,6 +14,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -30,7 +35,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...rollers/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml b/...rollers/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml
@@ -30,7 +30,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...ollers/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml b/...ollers/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml
@@ -14,6 +14,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -30,7 +35,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/...llers/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml b/...llers/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml
@@ -30,7 +30,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml
@@ -14,6 +14,11 @@ spec:
       name: mercari-app
 status:
   conditions:
+    tortoiseConditions:
+    - message: "HPA target utilization is updated"
+      reason: HPATargetUtilizationUpdated
+      status: "True"
+      type: HPATargetUtilizationUpdated
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -30,7 +35,6 @@ status:
         memory:
           quantity: 3Gi
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas:

diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml b/controllers/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml
@@ -30,7 +30,6 @@ status:
         memory:
           quantity: "0"
           updatedAt: null
-    tortoiseConditions: null
   recommendations:
     horizontal:
       maxReplicas: