From 3eb34d8b6ce7464d6b5402856acc1b4ee208fa6b Mon Sep 17 00:00:00 2001
From: Qirui <qiruiluo2022@u.northwestern.edu>
Date: Mon, 20 Mar 2023 11:43:47 +0800
Subject: [PATCH] Chore: add min ready seconds tweak function

---
 pkg/apis/apps/validation/validation_test.go | 53 +++++----------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/pkg/apis/apps/validation/validation_test.go b/pkg/apis/apps/validation/validation_test.go
index 8b606668ead..bbdcd2764ad 100644
--- a/pkg/apis/apps/validation/validation_test.go
+++ b/pkg/apis/apps/validation/validation_test.go
@@ -92,6 +92,12 @@ func tweakTemplateRestartPolicy(rp api.RestartPolicy) statefulSetTweak {
 	}
 }
 
+func tweakMinReadySeconds(t int32) statefulSetTweak {
+	return func(ss *apps.StatefulSet) {
+		ss.Spec.MinReadySeconds = t
+	}
+}
+
 func TestValidateStatefulSet(t *testing.T) {
 	validLabels := map[string]string{"a": "b"}
 	validPodTemplate := api.PodTemplate{
@@ -986,49 +992,14 @@ func TestValidateStatefulSetUpdate(t *testing.T) {
 			},
 		},
 		{
-			name: "update min ready seconds 1",
-			old: apps.StatefulSet{
-				ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault},
-				Spec: apps.StatefulSetSpec{
-					PodManagementPolicy: apps.OrderedReadyPodManagement,
-					Selector:            &metav1.LabelSelector{MatchLabels: validLabels},
-					Template:            validPodTemplate.Template,
-					UpdateStrategy:      apps.StatefulSetUpdateStrategy{Type: apps.RollingUpdateStatefulSetStrategyType},
-				},
-			},
-			update: apps.StatefulSet{
-				ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault},
-				Spec: apps.StatefulSetSpec{
-					PodManagementPolicy: apps.OrderedReadyPodManagement,
-					Selector:            &metav1.LabelSelector{MatchLabels: validLabels},
-					Template:            validPodTemplate.Template,
-					UpdateStrategy:      apps.StatefulSetUpdateStrategy{Type: apps.RollingUpdateStatefulSetStrategyType},
-					MinReadySeconds:     10,
-				},
-			},
+			name:   "update min ready seconds 1",
+			old:    mkStatefulSet(&validPodTemplate),
+			update: mkStatefulSet(&validPodTemplate, tweakMinReadySeconds(10)),
 		},
 		{
-			name: "update min ready seconds 2",
-			old: apps.StatefulSet{
-				ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault},
-				Spec: apps.StatefulSetSpec{
-					PodManagementPolicy: apps.OrderedReadyPodManagement,
-					Selector:            &metav1.LabelSelector{MatchLabels: validLabels},
-					Template:            validPodTemplate.Template,
-					UpdateStrategy:      apps.StatefulSetUpdateStrategy{Type: apps.RollingUpdateStatefulSetStrategyType},
-					MinReadySeconds:     5,
-				},
-			},
-			update: apps.StatefulSet{
-				ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault},
-				Spec: apps.StatefulSetSpec{
-					PodManagementPolicy: apps.OrderedReadyPodManagement,
-					Selector:            &metav1.LabelSelector{MatchLabels: validLabels},
-					Template:            validPodTemplate.Template,
-					UpdateStrategy:      apps.StatefulSetUpdateStrategy{Type: apps.RollingUpdateStatefulSetStrategyType},
-					MinReadySeconds:     10,
-				},
-			},
+			name:   "update min ready seconds 2",
+			old:    mkStatefulSet(&validPodTemplate, tweakMinReadySeconds(5)),
+			update: mkStatefulSet(&validPodTemplate, tweakMinReadySeconds(10)),
 		},
 		{
 			name: "update existing instance with now-invalid name",