abstract deschedulerPolicyConfigMap and deschedulerDeployment methods

kubernetes-sigs · Aug 22, 2024 · 45e0968 · 45e0968
1 parent b8ae339
commit 45e0968
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 21 deletions.
diff --git a/test/e2e/e2e_duplicatepods_test.go b/test/e2e/e2e_duplicatepods_test.go
@@ -189,8 +189,7 @@ func TestRemoveDuplicates(t *testing.T) {
 			tc.removeDuplicatesArgs.Namespaces = &api.Namespaces{
 				Include: []string{testNamespace.Name},
 			}
-			tc.evictorArgs.MinPodAge = &metav1.Duration{Duration: 1 * time.Second}
-			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(removeDuplicatesPolicy(tc.removeDuplicatesArgs, tc.evictorArgs))
+			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(removeDuplicatesPolicy(tc.removeDuplicatesArgs, tc.evictorArgs), nil)
 			if err != nil {
 				t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 			}
@@ -209,7 +208,7 @@ func TestRemoveDuplicates(t *testing.T) {
 				}
 			}()
 
-			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name)
+			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name, nil)
 			t.Logf("Creating descheduler deployment %v", deschedulerDeploymentObj.Name)
 			_, err = clientSet.AppsV1().Deployments(deschedulerDeploymentObj.Namespace).Create(ctx, deschedulerDeploymentObj, metav1.CreateOptions{})
 			if err != nil {

diff --git a/test/e2e/e2e_failedpods_test.go b/test/e2e/e2e_failedpods_test.go
@@ -145,7 +145,7 @@ func TestFailedPods(t *testing.T) {
 				Include: []string{testNamespace.Name},
 			}
 
-			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(removeFailedPodsPolicy(tc.removeFailedPodsArgs, evictorArgs))
+			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(removeFailedPodsPolicy(tc.removeFailedPodsArgs, evictorArgs), nil)
 			if err != nil {
 				t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 			}
@@ -164,7 +164,7 @@ func TestFailedPods(t *testing.T) {
 				}
 			}()
 
-			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name)
+			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name, nil)
 			t.Logf("Creating descheduler deployment %v", deschedulerDeploymentObj.Name)
 			_, err = clientSet.AppsV1().Deployments(deschedulerDeploymentObj.Namespace).Create(ctx, deschedulerDeploymentObj, metav1.CreateOptions{})
 			if err != nil {

diff --git a/test/e2e/e2e_leaderelection_test.go b/test/e2e/e2e_leaderelection_test.go
@@ -209,10 +209,10 @@ func startDeschedulerServer(t *testing.T, ctx context.Context, clientSet clients
 		EvictSystemCriticalPods: false,
 		IgnorePvcPods:           false,
 		EvictFailedBarePods:     false,
-		MinPodAge:               &metav1.Duration{Duration: 1 * time.Second},
 	}
-	deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(podlifetimePolicy(podLifeTimeArgs, evictorArgs))
-	deschedulerPolicyConfigMapObj.Name = fmt.Sprintf("%s-%s", deschedulerPolicyConfigMapObj.Name, testName)
+	deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(podlifetimePolicy(podLifeTimeArgs, evictorArgs), func(cm *v1.ConfigMap) {
+		cm.Name = fmt.Sprintf("%s-%s", cm.Name, testName)
+	})
 	if err != nil {
 		t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 	}
@@ -223,10 +223,24 @@ func startDeschedulerServer(t *testing.T, ctx context.Context, clientSet clients
 		t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 	}
 
-	deschedulerDeploymentObj := deschedulerDeployment(testName)
-	deschedulerDeploymentObj.Name = fmt.Sprintf("%s-%s", deschedulerDeploymentObj.Name, testName)
-	args := deschedulerDeploymentObj.Spec.Template.Spec.Containers[0].Args
-	deschedulerDeploymentObj.Spec.Template.Spec.Containers[0].Args = append(args, "--leader-elect")
+	deschedulerDeploymentObj := deschedulerDeployment(testName, func(deployment *appsv1.Deployment) {
+		deployment.Name = fmt.Sprintf("%s-%s", deployment.Name, testName)
+		args := deployment.Spec.Template.Spec.Containers[0].Args
+		deployment.Spec.Template.Spec.Containers[0].Args = append(args, "--leader-elect")
+		deployment.Spec.Template.Spec.Volumes = []v1.Volume{
+			{
+				Name: "policy-volume",
+				VolumeSource: v1.VolumeSource{
+					ConfigMap: &v1.ConfigMapVolumeSource{
+						LocalObjectReference: v1.LocalObjectReference{
+							Name: deschedulerPolicyConfigMapObj.Name,
+						},
+					},
+				},
+			},
+		}
+	})
+
 	t.Logf("Creating descheduler deployment %v", deschedulerDeploymentObj.Name)
 	_, err = clientSet.AppsV1().Deployments(deschedulerDeploymentObj.Namespace).Create(ctx, deschedulerDeploymentObj, metav1.CreateOptions{})
 	if err != nil {

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -69,7 +69,7 @@ func isClientRateLimiterError(err error) bool {
 	return strings.Contains(err.Error(), "client rate limiter")
 }
 
-func deschedulerPolicyConfigMap(policy *deschedulerapiv1alpha2.DeschedulerPolicy) (*v1.ConfigMap, error) {
+func deschedulerPolicyConfigMap(policy *deschedulerapiv1alpha2.DeschedulerPolicy, apply func(cm *v1.ConfigMap)) (*v1.ConfigMap, error) {
 	cm := &v1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "descheduler-policy-configmap",
@@ -83,11 +83,16 @@ func deschedulerPolicyConfigMap(policy *deschedulerapiv1alpha2.DeschedulerPolicy
 		return nil, err
 	}
 	cm.Data = map[string]string{"policy.yaml": string(policyBytes)}
+
+	if apply != nil {
+		apply(cm)
+	}
+
 	return cm, nil
 }
 
-func deschedulerDeployment(testName string) *appsv1.Deployment {
-	return &appsv1.Deployment{
+func deschedulerDeployment(testName string, apply func(deployment *appsv1.Deployment)) *appsv1.Deployment {
+	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "descheduler",
 			Namespace: "kube-system",
@@ -174,6 +179,12 @@ func deschedulerDeployment(testName string) *appsv1.Deployment {
 			},
 		},
 	}
+
+	if apply != nil {
+		apply(deployment)
+	}
+
+	return deployment
 }
 
 func printPodLogs(ctx context.Context, t *testing.T, kubeClient clientset.Interface, podName string) {

diff --git a/test/e2e/e2e_toomanyrestarts_test.go b/test/e2e/e2e_toomanyrestarts_test.go
@@ -156,7 +156,7 @@ func TestTooManyRestarts(t *testing.T) {
 				Include: []string{testNamespace.Name},
 			}
 
-			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(tooManyRestartsPolicy(tc.restartsArgs, evictorArgs))
+			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(tooManyRestartsPolicy(tc.restartsArgs, evictorArgs), nil)
 			if err != nil {
 				t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 			}
@@ -175,7 +175,7 @@ func TestTooManyRestarts(t *testing.T) {
 				}
 			}()
 
-			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name)
+			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name, nil)
 			t.Logf("Creating descheduler deployment %v", deschedulerDeploymentObj.Name)
 			_, err = clientSet.AppsV1().Deployments(deschedulerDeploymentObj.Namespace).Create(ctx, deschedulerDeploymentObj, metav1.CreateOptions{})
 			if err != nil {

diff --git a/test/e2e/e2e_topologyspreadconstraint_test.go b/test/e2e/e2e_topologyspreadconstraint_test.go
@@ -220,7 +220,7 @@ func TestTopologySpreadConstraint(t *testing.T) {
 					Include: []string{testNamespace.Name},
 				},
 			}
-			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(topologySpreadConstraintPolicy(constraintArgs, evictorArgs))
+			deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(topologySpreadConstraintPolicy(constraintArgs, evictorArgs), nil)
 			if err != nil {
 				t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 			}
@@ -238,7 +238,7 @@ func TestTopologySpreadConstraint(t *testing.T) {
 					t.Fatalf("Unable to delete %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 				}
 			}()
-			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name)
+			deschedulerDeploymentObj := deschedulerDeployment(testNamespace.Name, nil)
 			t.Logf("Creating descheduler deployment %v", deschedulerDeploymentObj.Name)
 			_, err = clientSet.AppsV1().Deployments(deschedulerDeploymentObj.Namespace).Create(ctx, deschedulerDeploymentObj, metav1.CreateOptions{})
 			if err != nil {

diff --git a/test/e2e/test_clientconnection_test.go b/test/e2e/test_clientconnection_test.go
@@ -24,7 +24,7 @@ func TestClientConnectionConfiguration(t *testing.T) {
 		t.Errorf("Error during kubernetes client creation with %v", err)
 	}
 
-	deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(&apiv1alpha2.DeschedulerPolicy{})
+	deschedulerPolicyConfigMapObj, err := deschedulerPolicyConfigMap(&apiv1alpha2.DeschedulerPolicy{}, nil)
 	if err != nil {
 		t.Fatalf("Error creating %q CM: %v", deschedulerPolicyConfigMapObj.Name, err)
 	}
@@ -43,7 +43,7 @@ func TestClientConnectionConfiguration(t *testing.T) {
 		}
 	}()
 
-	deschedulerDeploymentObj := deschedulerDeployment(testName)
+	deschedulerDeploymentObj := deschedulerDeployment(testName, nil)
 	t.Logf("Creating descheduler deployment %v", deschedulerDeploymentObj.Name)
 	_, err = clientSet.AppsV1().Deployments(deschedulerDeploymentObj.Namespace).Create(ctx, deschedulerDeploymentObj, metav1.CreateOptions{})
 	if err != nil {