@@ -27,6 +27,7 @@ import (
27
27
28
28
appsv1 "k8s.io/api/apps/v1"
29
29
v1 "k8s.io/api/core/v1"
30
+ apierrors "k8s.io/apimachinery/pkg/api/errors"
30
31
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
31
32
"k8s.io/apimachinery/pkg/labels"
32
33
"k8s.io/apimachinery/pkg/runtime"
@@ -124,6 +125,15 @@ func TestLeaderElection(t *testing.T) {
124
125
waitForPodsRunning (ctx , t , clientSet , deployment2 .Labels , 5 , deployment2 .Namespace )
125
126
podListBOrg := getCurrentPodNames (t , ctx , clientSet , ns2 )
126
127
128
+ // Delete the descheduler lease
129
+ err = clientSet .CoordinationV1 ().Leases ("kube-system" ).Delete (ctx , "descheduler" , metav1.DeleteOptions {})
130
+ if err != nil {
131
+ if ! apierrors .IsNotFound (err ) {
132
+ t .Fatalf ("Unable to remove kube-system/descheduler lease: %v" , err )
133
+ }
134
+ }
135
+ t .Logf ("Removed kube-system/descheduler lease" )
136
+
127
137
t .Log ("Starting deschedulers" )
128
138
pod1Name , deploy1 , cm1 := startDeschedulerServer (t , ctx , clientSet , ns1 )
129
139
time .Sleep (1 * time .Second )
@@ -150,6 +160,8 @@ func TestLeaderElection(t *testing.T) {
150
160
t .Fatalf ("Unable to delete %q CM: %v" , cm .Name , err )
151
161
}
152
162
}
163
+
164
+ clientSet .CoordinationV1 ().Leases ("kube-system" ).Delete (ctx , "descheduler" , metav1.DeleteOptions {})
153
165
}()
154
166
155
167
// wait for a while so all the pods are 5 seconds older
@@ -226,7 +238,7 @@ func startDeschedulerServer(t *testing.T, ctx context.Context, clientSet clients
226
238
deschedulerDeploymentObj := deschedulerDeployment (testName , func (deployment * appsv1.Deployment ) {
227
239
deployment .Name = fmt .Sprintf ("%s-%s" , deployment .Name , testName )
228
240
args := deployment .Spec .Template .Spec .Containers [0 ].Args
229
- deployment .Spec .Template .Spec .Containers [0 ].Args = append (args , "--leader-elect" )
241
+ deployment .Spec .Template .Spec .Containers [0 ].Args = append (args , "--leader-elect" , "--leader-elect-retry-period" , "1s" )
230
242
deployment .Spec .Template .Spec .Volumes = []v1.Volume {
231
243
{
232
244
Name : "policy-volume" ,
0 commit comments