modify tests

mercari · Oct 10, 2023 · 585bbc9 · 585bbc9
1 parent 18a0fe9
commit 585bbc9
Show file tree

Hide file tree

Showing 32 changed files with 278 additions and 82 deletions.
diff --git a/api/autoscaling/v2/horizontalpodautoscaler_webhook_test.go b/api/autoscaling/v2/horizontalpodautoscaler_webhook_test.go
@@ -50,15 +50,18 @@ func mutateTest(before, after, torotise string) {
 	err = yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096).Decode(tor)
 	status := tor.Status
 	Expect(err).NotTo(HaveOccurred())
-	err = k8sClient.Create(ctx, tor)
+	err = k8sClient.Create(ctx, tor.DeepCopy())
 	Expect(err).NotTo(HaveOccurred())
 	defer func() {
 		err = k8sClient.Delete(ctx, tor)
 		Expect(err).NotTo(HaveOccurred())
 	}()
+
+	err = k8sClient.Get(ctx, types.NamespacedName{Name: tor.GetName(), Namespace: tor.GetNamespace()}, tor)
+	Expect(err).NotTo(HaveOccurred())
 	tor.Status = status
-	//nolint:errcheck
-	k8sClient.Status().Update(ctx, tor)
+	err = k8sClient.Status().Update(ctx, tor)
+	Expect(err).NotTo(HaveOccurred())
 
 	y, err = os.ReadFile(before)
 	Expect(err).NotTo(HaveOccurred())
@@ -87,9 +90,6 @@ func mutateTest(before, after, torotise string) {
 
 var _ = Describe("v2.HPA Webhook", func() {
 	Context("mutating", func() {
-		It("nothing to do", func() {
-			mutateTest(filepath.Join("testdata", "mutating", "nothing-to-do", "before.yaml"), filepath.Join("testdata", "mutating", "nothing-to-do", "after.yaml"), filepath.Join("testdata", "mutating", "nothing-to-do", "tortoise.yaml"))
-		})
 		It("HPA is mutated based on the recommendation", func() {
 			mutateTest(filepath.Join("testdata", "mutating", "mutate-by-recommendations", "before.yaml"), filepath.Join("testdata", "mutating", "mutate-by-recommendations", "after.yaml"), filepath.Join("testdata", "mutating", "mutate-by-recommendations", "tortoise.yaml"))
 		})

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
@@ -22,6 +22,15 @@ spec:
         memory: Vertical
 status:
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -22,6 +22,15 @@ spec:
         memory: Vertical
 status:
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -22,6 +22,15 @@ spec:
         memory: Vertical
 status:
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
   targets:
     deployment: sample
     horizontalPodAutoscaler: sample

diff --git a/api/autoscaling/v2/testdata/mutating/nothing-to-do/after.yaml b/api/autoscaling/v2/testdata/mutating/nothing-to-do/after.yaml
diff --git a/api/autoscaling/v2/testdata/mutating/nothing-to-do/before.yaml b/api/autoscaling/v2/testdata/mutating/nothing-to-do/before.yaml
diff --git a/api/autoscaling/v2/testdata/mutating/nothing-to-do/tortoise.yaml b/api/autoscaling/v2/testdata/mutating/nothing-to-do/tortoise.yaml
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/controllers/testdata/deletion-no-delete/before/tortoise.yaml b/controllers/testdata/deletion-no-delete/before/tortoise.yaml
@@ -83,3 +83,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
diff --git a/controllers/testdata/deletion-policy-all/before/tortoise.yaml b/controllers/testdata/deletion-policy-all/before/tortoise.yaml
@@ -83,3 +83,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -91,3 +91,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml
@@ -82,3 +82,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -89,3 +89,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -87,3 +87,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml
@@ -88,3 +88,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml b/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml
@@ -82,3 +82,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -86,3 +86,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -78,3 +78,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -87,3 +87,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -79,3 +79,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: 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
@@ -91,3 +91,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Emergency
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
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
@@ -83,3 +83,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working
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
@@ -89,3 +89,12 @@ status:
     - name: tortoise-monitor-mercari
       role: Monitor
   tortoisePhase: Working
+  containerResourcePhases:
+    - containerName: "nginx"
+      resourcePhases:
+        cpu: Working 
+        memory: Working
+    - containerName: "istio-proxy"
+      resourcePhases: 
+        cpu: Working 
+        memory: Working