Skip to content

Commit 0b23cd0

Browse files
committed
fix namespace issue
1 parent 664e9a2 commit 0b23cd0

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

test/integration/cluster_placement_test.go

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ var _ = Describe("Test Cluster Resource Placement Controller", func() {
16431643
Group: corev1.GroupName,
16441644
Version: "v1",
16451645
Kind: "Namespace",
1646-
Name: "test-namespace",
1646+
Name: ns.Name,
16471647
},
16481648
},
16491649
Policy: &fleetv1alpha1.PlacementPolicy{
@@ -1655,17 +1655,18 @@ var _ = Describe("Test Cluster Resource Placement Controller", func() {
16551655

16561656
var clusterWork workv1alpha1.Work
16571657
workResourceIdentifier1 := workv1alpha1.ResourceIdentifier{
1658-
Group: kruisev1alpha1.GroupVersion.Group,
1659-
Kind: "CloneSet",
1660-
Name: "test-cloneset",
1661-
Ordinal: 0,
1662-
Resource: "clonesets",
1663-
Version: kruisev1alpha1.GroupVersion.Version,
1658+
Group: kruisev1alpha1.GroupVersion.Group,
1659+
Kind: "CloneSet",
1660+
Name: cs.Name,
1661+
Namespace: cs.Namespace,
1662+
Ordinal: 0,
1663+
Resource: "clonesets",
1664+
Version: kruisev1alpha1.GroupVersion.Version,
16641665
}
16651666
workResourceIdentifier2 := workv1alpha1.ResourceIdentifier{
16661667
Group: corev1.GroupName,
16671668
Kind: "Namespace",
1668-
Name: "test-namespace",
1669+
Name: ns.Name,
16691670
Ordinal: 1,
16701671
Resource: "namespaces",
16711672
Version: "v1",
@@ -1718,14 +1719,14 @@ var _ = Describe("Test Cluster Resource Placement Controller", func() {
17181719
Group: kruisev1alpha1.GroupVersion.Group,
17191720
Version: kruisev1alpha1.GroupVersion.Version,
17201721
Kind: "CloneSet",
1721-
Name: "test-cloneset",
1722-
Namespace: "test-namespace",
1722+
Name: cs.Name,
1723+
Namespace: cs.Namespace,
17231724
}
17241725
fleetResourceIdentifier2 := fleetv1alpha1.ResourceIdentifier{
17251726
Group: corev1.GroupName,
17261727
Version: "v1",
17271728
Kind: "Namespace",
1728-
Name: "test-namespace",
1729+
Name: ns.Name,
17291730
}
17301731
wantCRPStatus := fleetv1alpha1.ClusterResourcePlacementStatus{
17311732
Conditions: []metav1.Condition{
@@ -1747,11 +1748,11 @@ var _ = Describe("Test Cluster Resource Placement Controller", func() {
17471748
FailedResourcePlacements: []fleetv1alpha1.FailedResourcePlacement{
17481749
{
17491750
ResourceIdentifier: fleetv1alpha1.ResourceIdentifier{
1750-
Group: kruisev1alpha1.GroupVersion.Group,
1751-
Version: kruisev1alpha1.GroupVersion.Version,
1752-
Kind: "CloneSet",
1753-
Name: "test-cloneset",
1754-
// Namespace for clone set is not being picked up
1751+
Group: kruisev1alpha1.GroupVersion.Group,
1752+
Version: kruisev1alpha1.GroupVersion.Version,
1753+
Kind: "CloneSet",
1754+
Name: cs.Name,
1755+
Namespace: cs.Namespace,
17551756
},
17561757
ClusterName: clusterA.Name,
17571758
Condition: metav1.Condition{
@@ -1792,7 +1793,7 @@ var _ = Describe("Test Cluster Resource Placement Controller", func() {
17921793
Group: corev1.GroupName,
17931794
Version: "v1",
17941795
Kind: "Namespace",
1795-
Name: "test-namespace",
1796+
Name: ns.Name,
17961797
},
17971798
}
17981799
Expect(k8sClient.Update(ctx, crp)).Should(Succeed(), "Failed to update %s cluster resource placement", crp.Name)

0 commit comments

Comments
 (0)