Skip to content

Commit 6160725

Browse files
feat: apply the secret/configmap before workloads (#1071)
1 parent 22dc1a0 commit 6160725

File tree

9 files changed

+742
-518
lines changed

9 files changed

+742
-518
lines changed

pkg/controllers/clusterresourceplacement/controller_integration_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var (
6565
crpOwnerReference = metav1.OwnerReference{
6666
APIVersion: fleetAPIVersion,
6767
Kind: "ClusterResourcePlacement",
68-
Name: testName,
68+
Name: testCRPName,
6969
Controller: ptr.To(true),
7070
BlockOwnerDeletion: ptr.To(true),
7171
}
@@ -214,7 +214,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
214214
By("Create a new crp")
215215
crp = &placementv1beta1.ClusterResourcePlacement{
216216
ObjectMeta: metav1.ObjectMeta{
217-
Name: testName,
217+
Name: testCRPName,
218218
},
219219
Spec: placementv1beta1.ClusterResourcePlacementSpec{
220220
ResourceSelectors: []placementv1beta1.ClusterResourceSelector{
@@ -289,7 +289,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
289289
By("By checking CRP status")
290290
wantCRP := &placementv1beta1.ClusterResourcePlacement{
291291
ObjectMeta: metav1.ObjectMeta{
292-
Name: testName,
292+
Name: testCRPName,
293293
Finalizers: []string{placementv1beta1.ClusterResourcePlacementCleanupFinalizer},
294294
},
295295
Spec: crp.Spec,
@@ -304,7 +304,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
304304
},
305305
},
306306
}
307-
gotCRP = retrieveAndValidateClusterResourcePlacement(testName, wantCRP)
307+
gotCRP = retrieveAndValidateClusterResourcePlacement(testCRPName, wantCRP)
308308
})
309309

310310
AfterEach(func() {
@@ -328,7 +328,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
328328
By("By validating the CRP status has only scheduling condition")
329329
wantCRP := &placementv1beta1.ClusterResourcePlacement{
330330
ObjectMeta: metav1.ObjectMeta{
331-
Name: testName,
331+
Name: testCRPName,
332332
Finalizers: []string{placementv1beta1.ClusterResourcePlacementCleanupFinalizer},
333333
},
334334
Spec: crp.Spec,
@@ -343,7 +343,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
343343
},
344344
},
345345
}
346-
retrieveAndValidateClusterResourcePlacement(testName, wantCRP)
346+
retrieveAndValidateClusterResourcePlacement(testCRPName, wantCRP)
347347
})
348348

349349
It("Clusters are selected and resources are applied successfully", func() {
@@ -376,7 +376,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
376376
By("By validating the CRP status")
377377
wantCRP := &placementv1beta1.ClusterResourcePlacement{
378378
ObjectMeta: metav1.ObjectMeta{
379-
Name: testName,
379+
Name: testCRPName,
380380
Finalizers: []string{placementv1beta1.ClusterResourcePlacementCleanupFinalizer},
381381
},
382382
Spec: crp.Spec,
@@ -438,14 +438,14 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
438438
},
439439
},
440440
}
441-
retrieveAndValidateClusterResourcePlacement(testName, wantCRP)
441+
retrieveAndValidateClusterResourcePlacement(testCRPName, wantCRP)
442442

443443
By("By creating a synchronized clusterResourceBinding on member-2")
444444
createSynchronizedClusterResourceBinding(member2Name, gotPolicySnapshot, gotResourceSnapshot)
445445

446446
wantCRP = &placementv1beta1.ClusterResourcePlacement{
447447
ObjectMeta: metav1.ObjectMeta{
448-
Name: testName,
448+
Name: testCRPName,
449449
Finalizers: []string{placementv1beta1.ClusterResourcePlacementCleanupFinalizer},
450450
},
451451
Spec: crp.Spec,
@@ -533,7 +533,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
533533
},
534534
},
535535
}
536-
retrieveAndValidateClusterResourcePlacement(testName, wantCRP)
536+
retrieveAndValidateClusterResourcePlacement(testCRPName, wantCRP)
537537
})
538538
})
539539
})

0 commit comments

Comments
 (0)