Skip to content

Commit 0bb5cbf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2987 from SataQiu/clean-20200430
🏃 Remove use of metav1.FinalizerDeleteDependents from tests
2 parents 6dc38f9 + ae33d81 commit 0bb5cbf

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

Diff for: ‎controllers/machine_controller_test.go

+13-12
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ func TestReconcileRequest(t *testing.T) {
338338
ObjectMeta: metav1.ObjectMeta{
339339
Name: "created",
340340
Namespace: "default",
341-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
341+
Finalizers: []string{clusterv1.MachineFinalizer},
342342
},
343343
Spec: clusterv1.MachineSpec{
344344
ClusterName: "test-cluster",
@@ -365,7 +365,7 @@ func TestReconcileRequest(t *testing.T) {
365365
ObjectMeta: metav1.ObjectMeta{
366366
Name: "updated",
367367
Namespace: "default",
368-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
368+
Finalizers: []string{clusterv1.MachineFinalizer},
369369
},
370370
Spec: clusterv1.MachineSpec{
371371
ClusterName: "test-cluster",
@@ -395,7 +395,7 @@ func TestReconcileRequest(t *testing.T) {
395395
Labels: map[string]string{
396396
clusterv1.MachineControlPlaneLabelName: "",
397397
},
398-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
398+
Finalizers: []string{clusterv1.MachineFinalizer},
399399
DeletionTimestamp: &time,
400400
},
401401
Spec: clusterv1.MachineSpec{
@@ -575,7 +575,7 @@ func TestRemoveMachineFinalizerAfterDeleteReconcile(t *testing.T) {
575575
ObjectMeta: metav1.ObjectMeta{
576576
Name: "delete123",
577577
Namespace: "default",
578-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
578+
Finalizers: []string{clusterv1.MachineFinalizer},
579579
DeletionTimestamp: &dt,
580580
},
581581
Spec: clusterv1.MachineSpec{
@@ -597,8 +597,9 @@ func TestRemoveMachineFinalizerAfterDeleteReconcile(t *testing.T) {
597597
_, err := mr.Reconcile(reconcile.Request{NamespacedName: key})
598598
g.Expect(err).ToNot(HaveOccurred())
599599

600-
g.Expect(mr.Client.Get(ctx, key, m)).To(Succeed())
601-
g.Expect(m.ObjectMeta.Finalizers).To(Equal([]string{metav1.FinalizerDeleteDependents}))
600+
var actual clusterv1.Machine
601+
g.Expect(mr.Client.Get(ctx, key, &actual)).To(Succeed())
602+
g.Expect(actual.ObjectMeta.Finalizers).To(BeEmpty())
602603
}
603604

604605
func TestReconcileMetrics(t *testing.T) {
@@ -803,7 +804,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
803804
ObjectMeta: metav1.ObjectMeta{
804805
Name: "created",
805806
Namespace: "default",
806-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
807+
Finalizers: []string{clusterv1.MachineFinalizer},
807808
},
808809
Spec: clusterv1.MachineSpec{
809810
ClusterName: "test-cluster",
@@ -821,7 +822,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
821822
ObjectMeta: metav1.ObjectMeta{
822823
Name: "created",
823824
Namespace: "default",
824-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
825+
Finalizers: []string{clusterv1.MachineFinalizer},
825826
},
826827
Spec: clusterv1.MachineSpec{
827828
ClusterName: "test-cluster",
@@ -847,7 +848,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
847848
clusterv1.ClusterLabelName: "test",
848849
clusterv1.MachineControlPlaneLabelName: "",
849850
},
850-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
851+
Finalizers: []string{clusterv1.MachineFinalizer},
851852
DeletionTimestamp: &metav1.Time{Time: time.Now().UTC()},
852853
},
853854
Spec: clusterv1.MachineSpec{
@@ -873,7 +874,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
873874
Labels: map[string]string{
874875
clusterv1.ClusterLabelName: "test",
875876
},
876-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
877+
Finalizers: []string{clusterv1.MachineFinalizer},
877878
},
878879
Spec: clusterv1.MachineSpec{
879880
ClusterName: "test-cluster",
@@ -911,7 +912,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
911912
Labels: map[string]string{
912913
clusterv1.ClusterLabelName: "test",
913914
},
914-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
915+
Finalizers: []string{clusterv1.MachineFinalizer},
915916
},
916917
Spec: clusterv1.MachineSpec{
917918
ClusterName: "test-cluster",
@@ -931,7 +932,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
931932
Labels: map[string]string{
932933
clusterv1.ClusterLabelName: "test",
933934
},
934-
Finalizers: []string{clusterv1.MachineFinalizer, metav1.FinalizerDeleteDependents},
935+
Finalizers: []string{clusterv1.MachineFinalizer},
935936
},
936937
Spec: clusterv1.MachineSpec{
937938
ClusterName: "test-cluster",

Diff for: ‎exp/controllers/machinepool_controller_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package controllers
1818

1919
import (
20-
"sigs.k8s.io/cluster-api/util"
2120
"testing"
2221

2322
. "github.com/onsi/gomega"
@@ -30,6 +29,7 @@ import (
3029
"k8s.io/utils/pointer"
3130
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
3231
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha3"
32+
"sigs.k8s.io/cluster-api/util"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3535
"sigs.k8s.io/controller-runtime/pkg/log"
@@ -304,7 +304,7 @@ func TestReconcileMachinePoolRequest(t *testing.T) {
304304
ObjectMeta: metav1.ObjectMeta{
305305
Name: "created",
306306
Namespace: "default",
307-
Finalizers: []string{expv1.MachinePoolFinalizer, metav1.FinalizerDeleteDependents},
307+
Finalizers: []string{expv1.MachinePoolFinalizer},
308308
},
309309
Spec: expv1.MachinePoolSpec{
310310
ClusterName: "test-cluster",
@@ -340,7 +340,7 @@ func TestReconcileMachinePoolRequest(t *testing.T) {
340340
ObjectMeta: metav1.ObjectMeta{
341341
Name: "updated",
342342
Namespace: "default",
343-
Finalizers: []string{expv1.MachinePoolFinalizer, metav1.FinalizerDeleteDependents},
343+
Finalizers: []string{expv1.MachinePoolFinalizer},
344344
},
345345
Spec: expv1.MachinePoolSpec{
346346
ClusterName: "test-cluster",
@@ -378,7 +378,7 @@ func TestReconcileMachinePoolRequest(t *testing.T) {
378378
Labels: map[string]string{
379379
clusterv1.MachineControlPlaneLabelName: "",
380380
},
381-
Finalizers: []string{expv1.MachinePoolFinalizer, metav1.FinalizerDeleteDependents},
381+
Finalizers: []string{expv1.MachinePoolFinalizer},
382382
DeletionTimestamp: &time,
383383
},
384384
Spec: expv1.MachinePoolSpec{
@@ -574,7 +574,7 @@ func TestRemoveMachinePoolFinalizerAfterDeleteReconcile(t *testing.T) {
574574
ObjectMeta: metav1.ObjectMeta{
575575
Name: "delete123",
576576
Namespace: "default",
577-
Finalizers: []string{expv1.MachinePoolFinalizer, metav1.FinalizerDeleteDependents},
577+
Finalizers: []string{expv1.MachinePoolFinalizer},
578578
DeletionTimestamp: &dt,
579579
},
580580
Spec: expv1.MachinePoolSpec{
@@ -601,6 +601,7 @@ func TestRemoveMachinePoolFinalizerAfterDeleteReconcile(t *testing.T) {
601601
_, err := mr.Reconcile(reconcile.Request{NamespacedName: key})
602602
g.Expect(err).ToNot(HaveOccurred())
603603

604-
g.Expect(mr.Client.Get(ctx, key, m)).To(Succeed())
605-
g.Expect(m.ObjectMeta.Finalizers).To(Equal([]string{metav1.FinalizerDeleteDependents}))
604+
var actual expv1.MachinePool
605+
g.Expect(mr.Client.Get(ctx, key, &actual)).To(Succeed())
606+
g.Expect(actual.ObjectMeta.Finalizers).To(BeEmpty())
606607
}

0 commit comments

Comments
 (0)