introduce LastTransitionTime and change phase based on that (#167)

* introduce LastTransitionTime and change phase based on that * fix by lint
mercari · Oct 11, 2023 · c555c8b · c555c8b
1 parent f24677d
commit c555c8b
Show file tree

Hide file tree

Showing 39 changed files with 973 additions and 234 deletions.
diff --git a/api/autoscaling/v2/testdata/mutating/has-annotation-but-invalid1/tortoise.yaml b/api/autoscaling/v2/testdata/mutating/has-annotation-but-invalid1/tortoise.yaml
@@ -25,12 +25,16 @@ status:
   containerResourcePhases:
     - containerName: "nginx"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
   targets:
     deployment: sample
     horizontalPodAutoscaler: sample

diff --git a/api/autoscaling/v2/testdata/mutating/has-annotation-but-invalid2/tortoise.yaml b/api/autoscaling/v2/testdata/mutating/has-annotation-but-invalid2/tortoise.yaml
@@ -25,12 +25,16 @@ status:
   containerResourcePhases:
     - containerName: "nginx"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
   targets:
     deployment: sample
     horizontalPodAutoscaler: sample2

diff --git a/api/autoscaling/v2/testdata/mutating/mutate-by-recommendations/tortoise.yaml b/api/autoscaling/v2/testdata/mutating/mutate-by-recommendations/tortoise.yaml
@@ -25,12 +25,16 @@ status:
   containerResourcePhases:
     - containerName: "nginx"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
   targets:
     deployment: sample
     horizontalPodAutoscaler: sample

diff --git a/api/v1beta1/tortoise_types.go b/api/v1beta1/tortoise_types.go
@@ -154,7 +154,15 @@ type ContainerResourcePhases struct {
 	// ContainerName is the name of target container.
 	ContainerName string `json:"containerName" protobuf:"bytes,1,name=containerName"`
 	// ResourcePhases is the phase of each resource of this container.
-	ResourcePhases map[v1.ResourceName]ContainerResourcePhase `json:"resourcePhases" protobuf:"bytes,2,name=resourcePhases"`
+	ResourcePhases map[v1.ResourceName]ResourcePhase `json:"resourcePhases" protobuf:"bytes,2,name=resourcePhases"`
+}
+
+type ResourcePhase struct {
+	Phase ContainerResourcePhase `json:"phase" protobuf:"bytes,1,name=phase"`
+	// lastTransitionTime is the last time the condition transitioned from
+	// one status to another
+	// +optional
+	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,2,opt,name=lastTransitionTime"`
 }
 
 type ContainerResourcePhase string
@@ -176,6 +184,10 @@ const (
 	// TortoisePhaseWorking means tortoise is making the recommendations,
 	// and applying the recommendation values.
 	TortoisePhaseWorking TortoisePhase = "Working"
+	// TortoisePhasePartlyWorking means tortoise is making the recommendations,
+	// and applying the recommendation values.
+	// But, some of the resources are not scaled due to some reasons. (probably still gathering data)
+	TortoisePhasePartlyWorking TortoisePhase = "PartlyWorking"
 	// TortoisePhaseEmergency means tortoise is in the emergency mode.
 	TortoisePhaseEmergency TortoisePhase = "Emergency"
 	// TortoisePhaseBackToNormal means tortoise was in the emergency mode, and now it's coming back to the normal operation.

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
@@ -593,7 +593,17 @@ spec:
                       type: string
                     resourcePhases:
                       additionalProperties:
-                        type: string
+                        properties:
+                          lastTransitionTime:
+                            description: lastTransitionTime is the last time the condition
+                              transitioned from one status to another
+                            format: date-time
+                            type: string
+                          phase:
+                            type: string
+                        required:
+                        - phase
+                        type: object
                       description: ResourcePhases is the phase of each resource of
                         this container.
                       type: object

diff --git a/controllers/testdata/deletion-no-delete/before/tortoise.yaml b/controllers/testdata/deletion-no-delete/before/tortoise.yaml
@@ -86,9 +86,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
diff --git a/controllers/testdata/deletion-policy-all/before/tortoise.yaml b/controllers/testdata/deletion-policy-all/before/tortoise.yaml
@@ -86,9 +86,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml
@@ -94,9 +94,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: GatheringData
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: GatheringData 
diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml
@@ -85,9 +85,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -92,9 +92,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: GatheringData
-        memory: Working
+        cpu: 
+          phase: GatheringData 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -90,9 +90,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml
@@ -91,9 +91,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml
@@ -85,9 +85,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -89,9 +89,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -81,9 +81,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -90,9 +90,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -82,9 +82,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
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
@@ -94,9 +94,13 @@ status:
   containerResourcePhases:
     - containerName: "app"
       resourcePhases:
-        cpu: Working 
-        memory: Working
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working 
     - containerName: "istio-proxy"
-      resourcePhases: 
-        cpu: Working 
-        memory: Working
+      resourcePhases:
+        cpu: 
+          phase: Working 
+        memory:
+          phase: Working