hpa: align default scale-up behavior with Kubernetes

internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/hpa.yaml

@@ -16,6 +16,9 @@ spec:
       - periodSeconds: 60
         type: Percent
         value: 100
+      - periodSeconds: 60
+        type: Pods
+        value: 4
       selectPolicy: Max
       stabilizationWindowSeconds: 0
   maxReplicas: 20
@@ -48,20 +51,25 @@ spec:
     name: mercari-app
 status:
   conditions:
-    - status: "True"
-      type: AbleToScale
-      message: "recommended size matches current size"
-    - status: "True"
-      type: ScalingActive
-      message: "the HPA was able to compute the replica count"
+  - lastTransitionTime: null
+    message: recommended size matches current size
+    status: "True"
+    type: AbleToScale
+  - lastTransitionTime: null
+    message: the HPA was able to compute the replica count
+    status: "True"
+    type: ScalingActive
   currentMetrics:
-    - containerResource:
-        container: app
-        name: cpu
-        current:
-          value: 3
-    - containerResource:
-        container: istio-proxy
-        name: cpu
-        current:
-          value: 3
+  - containerResource:
+      container: app
+      current:
+        value: "3"
+      name: cpu
+    type: ""
+  - containerResource:
+      container: istio-proxy
+      current:
+        value: "3"
+      name: cpu
+    type: ""
+  desiredReplicas: 0

internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/deployment.yaml

@@ -8,7 +8,6 @@ spec:
   strategy: {}
   template:
     metadata:
-      annotations: null
       creationTimestamp: null
       labels:
         app: mercari

internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/hpa.yaml

@@ -14,6 +14,9 @@ spec:
       - periodSeconds: 60
         type: Percent
         value: 100
+      - periodSeconds: 60
+        type: Pods
+        value: 4
       selectPolicy: Max
       stabilizationWindowSeconds: 0
   maxReplicas: 10000

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

@@ -20,20 +20,6 @@ status:
       cpu: Vertical
       memory: Vertical
   conditions:
-    containerResourceRequests:
-    - containerName: app
-      resource:
-        cpu: "10"
-        memory: 10Gi
-    - containerName: istio-proxy
-      resource:
-        cpu: "4"
-        memory: 4Gi
-    tortoiseConditions:
-    - lastTransitionTime: "2023-01-01T00:00:00Z"
-      lastUpdateTime: "2023-01-01T00:00:00Z"
-      status: "False"
-      type: FailedToReconcile
     containerRecommendationFromVPA:
     - containerName: app
       maxRecommendation:
@@ -65,6 +51,37 @@ status:
         memory:
           quantity: 4Gi
           updatedAt: null
+    containerResourceRequests:
+    - containerName: app
+      resource:
+        cpu: "10"
+        memory: 10Gi
+    - containerName: istio-proxy
+      resource:
+        cpu: "4"
+        memory: 4Gi
+    tortoiseConditions:
+    - lastTransitionTime: "2023-01-01T00:00:00Z"
+      lastUpdateTime: "2023-01-01T00:00:00Z"
+      status: "False"
+      type: FailedToReconcile
+  containerResourcePhases:
+  - containerName: app
+    resourcePhases:
+      cpu:
+        lastTransitionTime: "2023-01-01T00:00:00Z"
+        phase: GatheringData
+      memory:
+        lastTransitionTime: "2023-01-01T00:00:00Z"
+        phase: Working
+  - containerName: istio-proxy
+    resourcePhases:
+      cpu:
+        lastTransitionTime: "2023-01-01T00:00:00Z"
+        phase: Working
+      memory:
+        lastTransitionTime: "2023-01-01T00:00:00Z"
+        phase: Working
   recommendations:
     horizontal:
       maxReplicas:
@@ -94,23 +111,6 @@ status:
           cpu: "4"
           memory: 4Gi
         containerName: istio-proxy
-  containerResourcePhases:
-  - containerName: app
-    resourcePhases:
-      cpu:
-        lastTransitionTime: "2023-01-01T00:00:00Z"
-        phase: GatheringData
-      memory:
-        lastTransitionTime: "2023-01-01T00:00:00Z"
-        phase: Working
-  - containerName: istio-proxy
-    resourcePhases:
-      cpu:
-        lastTransitionTime: "2023-01-01T00:00:00Z"
-        phase: Working
-      memory:
-        lastTransitionTime: "2023-01-01T00:00:00Z"
-        phase: Working
   targets:
     horizontalPodAutoscaler: tortoise-hpa-mercari
     scaleTargetRef:

internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/hpa.yaml

@@ -33,20 +33,25 @@ spec:
     name: mercari-app
 status:
   conditions:
-    - status: "True"
-      type: AbleToScale
-      message: "recommended size matches current size"
-    - status: "True"
-      type: ScalingActive
-      message: "the HPA was able to compute the replica count"
+  - lastTransitionTime: null
+    message: recommended size matches current size
+    status: "True"
+    type: AbleToScale
+  - lastTransitionTime: null
+    message: the HPA was able to compute the replica count
+    status: "True"
+    type: ScalingActive
   currentMetrics:
-    - containerResource:
-        container: app
-        name: cpu
-        current:
-          value: 3
-    - containerResource:
-        container: istio-proxy
-        name: cpu
-        current:
-          value: 3
+  - containerResource:
+      container: app
+      current:
+        value: "3"
+      name: cpu
+    type: ""
+  - containerResource:
+      container: istio-proxy
+      current:
+        value: "3"
+      name: cpu
+    type: ""
+  desiredReplicas: 0

internal/controller/testdata/reconcile-automatic-emergency-mode-hpa-back-to-working/after/deployment.yaml

@@ -10,21 +10,21 @@ spec:
     metadata:
       annotations:
         kubectl.kubernetes.io/restartedAt: "2023-01-01T00:00:00Z"
+        sidecar.istio.io/inject: "true"
+        sidecar.istio.io/proxyCPU: "4"
+        sidecar.istio.io/proxyMemory: 4Gi
       creationTimestamp: null
       labels:
         app: mercari
     spec:
       containers:
+      - image: auto
+        name: istio-proxy
+        resources: {}
       - image: awesome-mercari-app-image
         name: app
         resources:
           requests:
             cpu: "10"
             memory: 10Gi
-      - image: awesome-istio-proxy-image
-        name: istio-proxy
-        resources:
-          requests:
-            cpu: "4"
-            memory: 4Gi
 status: {}

internal/controller/testdata/reconcile-automatic-emergency-mode-hpa-back-to-working/after/hpa.yaml

@@ -16,6 +16,9 @@ spec:
       - periodSeconds: 60
         type: Percent
         value: 100
+      - periodSeconds: 60
+        type: Pods
+        value: 4
       selectPolicy: Max
       stabilizationWindowSeconds: 0
   maxReplicas: 20
@@ -41,22 +44,25 @@ spec:
     name: mercari-app
 status:
   conditions:
-    - status: "True"
-      type: AbleToScale
-      message: "recommended size matches current size"
-    - status: "True"
-      type: ScalingActive
-      message: "the HPA was able to compute the replica count"
+  - lastTransitionTime: null
+    message: recommended size matches current size
+    status: "True"
+    type: AbleToScale
+  - lastTransitionTime: null
+    message: the HPA was able to compute the replica count
+    status: "True"
+    type: ScalingActive
   currentMetrics:
-    - containerResource:
-        container: app
-        name: cpu
-        current:
-          value: 3
-      type: ContainerResource
-    - containerResource:
-        container: istio-proxy
-        name: cpu
-        current:
-          value: 3
-      type: ContainerResource
+  - containerResource:
+      container: app
+      current:
+        value: "3"
+      name: cpu
+    type: ContainerResource
+  - containerResource:
+      container: istio-proxy
+      current:
+        value: "3"
+      name: cpu
+    type: ContainerResource
+  desiredReplicas: 0

internal/controller/testdata/reconcile-automatic-emergency-mode-hpa-back-to-working/after/tortoise.yaml

@@ -70,7 +70,8 @@ status:
       type: HPATargetUtilizationUpdated
     - lastTransitionTime: "2023-01-01T00:00:00Z"
       lastUpdateTime: "2023-01-01T00:00:00Z"
-      message: the current number of replicas is not bigger than the preferred max replica number
+      message: the current number of replicas is not bigger than the preferred max
+        replica number
       reason: ScaledUpBasedOnPreferredMaxReplicas
       status: "False"
       type: ScaledUpBasedOnPreferredMaxReplicas

internal/controller/testdata/reconcile-automatic-emergency-mode-hpa-condition/after/deployment.yaml

@@ -10,21 +10,21 @@ spec:
     metadata:
       annotations:
         kubectl.kubernetes.io/restartedAt: "2023-01-01T00:00:00Z"
+        sidecar.istio.io/inject: "true"
+        sidecar.istio.io/proxyCPU: "4"
+        sidecar.istio.io/proxyMemory: 4Gi
       creationTimestamp: null
       labels:
         app: mercari
     spec:
       containers:
+      - image: auto
+        name: istio-proxy
+        resources: {}
       - image: awesome-mercari-app-image
         name: app
         resources:
           requests:
             cpu: "10"
             memory: 10Gi
-      - image: awesome-istio-proxy-image
-        name: istio-proxy
-        resources:
-          requests:
-            cpu: "4"
-            memory: 4Gi
 status: {}

internal/controller/testdata/reconcile-automatic-emergency-mode-hpa-condition/after/hpa.yaml

@@ -16,6 +16,9 @@ spec:
       - periodSeconds: 60
         type: Percent
         value: 100
+      - periodSeconds: 60
+        type: Pods
+        value: 4
       selectPolicy: Max
       stabilizationWindowSeconds: 0
   maxReplicas: 15
@@ -41,21 +44,25 @@ spec:
     name: mercari-app
 status:
   conditions:
-    - status: "True"
-      type: AbleToScale
-      message: "recommended size matches current size"
-    - status: "False"
-      type: ScalingActive
-      message: "the HPA was unable to compute the replica count: failed to get cpu utilization"
+  - lastTransitionTime: null
+    message: recommended size matches current size
+    status: "True"
+    type: AbleToScale
+  - lastTransitionTime: null
+    message: 'the HPA was unable to compute the replica count: failed to get cpu utilization'
+    status: "False"
+    type: ScalingActive
   currentMetrics:
-    - containerResource:
-        container: app
-        name: cpu
-        current:
-          value: 0
-    - containerResource:
-        container: istio-proxy
-        name: cpu
-        current:
-          value: 0
+  - containerResource:
+      container: app
+      current:
+        value: "0"
+      name: cpu
+    type: ""
+  - containerResource:
+      container: istio-proxy
+      current:
+        value: "0"
+      name: cpu
+    type: ""
   desiredReplicas: 0

internal/controller/testdata/reconcile-automatic-emergency-mode-hpa-no-metrics/after/deployment.yaml

@@ -10,21 +10,21 @@ spec:
     metadata:
       annotations:
         kubectl.kubernetes.io/restartedAt: "2023-01-01T00:00:00Z"
+        sidecar.istio.io/inject: "true"
+        sidecar.istio.io/proxyCPU: "4"
+        sidecar.istio.io/proxyMemory: 4Gi
       creationTimestamp: null
       labels:
         app: mercari
     spec:
       containers:
+      - image: auto
+        name: istio-proxy
+        resources: {}
       - image: awesome-mercari-app-image
         name: app
         resources:
           requests:
             cpu: "10"
             memory: 10Gi
-      - image: awesome-istio-proxy-image
-        name: istio-proxy
-        resources:
-          requests:
-            cpu: "4"
-            memory: 4Gi
 status: {}