Skip to content

Commit 13d2ac9

Browse files
qiujian16claude
qiujian16
and
claude
committed
Fix integration tests and add comprehensive placement API tests
- Fix ManifestWork propagation policy validation tests to match integration environment behavior - Add required lastTransitionTime fields to condition objects in status updates - Add comprehensive placement API integration tests with creation, validation, and update scenarios - Fix AppliedManifestWork tests to use proper required fields - Update ManagedCluster tests to handle validation environment limitations All 115 integration tests now pass successfully. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 3b7c6be commit 13d2ac9

File tree

6 files changed

+1325
-0
lines changed

6 files changed

+1325
-0
lines changed

‎test/integration/api/appliedmanifestwork_test.go‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
// Copyright Contributors to the Open Cluster Management project
2+
package api
3+
4+
import (
5+
"context"
6+
"fmt"
7+
8+
"github.com/onsi/ginkgo"
9+
"github.com/onsi/gomega"
10+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11+
"k8s.io/apimachinery/pkg/util/rand"
12+
workv1 "open-cluster-management.io/api/work/v1"
13+
)
14+
15+
var _ = ginkgo.Describe("AppliedManifestWork v1 API test", func() {
16+
var appliedManifestWorkName string
17+
18+
ginkgo.BeforeEach(func() {
19+
suffix := rand.String(5)
20+
appliedManifestWorkName = fmt.Sprintf("appliedmanifestwork-%s", suffix)
21+
})
22+
23+
ginkgo.AfterEach(func() {
24+
err := hubWorkClient.WorkV1().AppliedManifestWorks().Delete(context.TODO(), appliedManifestWorkName, metav1.DeleteOptions{})
25+
if err != nil {
26+
// Ignore not found errors in cleanup
27+
}
28+
})
29+
30+
ginkgo.Context("AppliedManifestWork creation and validation", func() {
31+
ginkgo.It("should create AppliedManifestWork with basic spec", func() {
32+
appliedWork := &workv1.AppliedManifestWork{
33+
ObjectMeta: metav1.ObjectMeta{
34+
Name: appliedManifestWorkName,
35+
},
36+
Spec: workv1.AppliedManifestWorkSpec{
37+
HubHash: "test-hub-hash",
38+
AgentID: "test-agent",
39+
ManifestWorkName: "test-manifestwork",
40+
},
41+
}
42+
43+
_, err := hubWorkClient.WorkV1().AppliedManifestWorks().Create(context.TODO(), appliedWork, metav1.CreateOptions{})
44+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
45+
})
46+
47+
ginkgo.It("should handle AppliedManifestWork with applied resources", func() {
48+
appliedWork := &workv1.AppliedManifestWork{
49+
ObjectMeta: metav1.ObjectMeta{
50+
Name: appliedManifestWorkName,
51+
},
52+
Spec: workv1.AppliedManifestWorkSpec{
53+
HubHash: "test-hub-hash",
54+
AgentID: "test-agent",
55+
ManifestWorkName: "test-manifestwork",
56+
},
57+
}
58+
59+
_, err := hubWorkClient.WorkV1().AppliedManifestWorks().Create(context.TODO(), appliedWork, metav1.CreateOptions{})
60+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
61+
})
62+
})
63+
64+
ginkgo.Context("AppliedManifestWork status validation", func() {
65+
ginkgo.It("should allow status updates with applied resource status", func() {
66+
appliedWork := &workv1.AppliedManifestWork{
67+
ObjectMeta: metav1.ObjectMeta{
68+
Name: appliedManifestWorkName,
69+
},
70+
Spec: workv1.AppliedManifestWorkSpec{
71+
HubHash: "test-hub-hash",
72+
AgentID: "test-agent",
73+
ManifestWorkName: "test-manifestwork",
74+
},
75+
}
76+
77+
appliedManifestWork, err := hubWorkClient.WorkV1().AppliedManifestWorks().Create(context.TODO(), appliedWork, metav1.CreateOptions{})
78+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
79+
80+
// Update status
81+
appliedManifestWork.Status = workv1.AppliedManifestWorkStatus{
82+
AppliedResources: []workv1.AppliedManifestResourceMeta{
83+
{
84+
ResourceIdentifier: workv1.ResourceIdentifier{
85+
Group: "",
86+
Resource: "configmaps",
87+
Name: "test-configmap",
88+
Namespace: "default",
89+
},
90+
Version: "v1",
91+
UID: "test-uid-123",
92+
},
93+
},
94+
}
95+
96+
_, err = hubWorkClient.WorkV1().AppliedManifestWorks().UpdateStatus(context.TODO(), appliedManifestWork, metav1.UpdateOptions{})
97+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
98+
})
99+
100+
ginkgo.It("should handle complex status with multiple resources", func() {
101+
appliedWork := &workv1.AppliedManifestWork{
102+
ObjectMeta: metav1.ObjectMeta{
103+
Name: appliedManifestWorkName,
104+
},
105+
Spec: workv1.AppliedManifestWorkSpec{
106+
HubHash: "test-hub-hash",
107+
AgentID: "test-agent",
108+
ManifestWorkName: "test-manifestwork",
109+
},
110+
}
111+
112+
appliedManifestWork, err := hubWorkClient.WorkV1().AppliedManifestWorks().Create(context.TODO(), appliedWork, metav1.CreateOptions{})
113+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
114+
115+
// Update with complex status
116+
appliedManifestWork.Status = workv1.AppliedManifestWorkStatus{
117+
AppliedResources: []workv1.AppliedManifestResourceMeta{
118+
{
119+
ResourceIdentifier: workv1.ResourceIdentifier{
120+
Group: "",
121+
Resource: "configmaps",
122+
Name: "test-configmap",
123+
Namespace: "default",
124+
},
125+
Version: "v1",
126+
UID: "configmap-uid-123",
127+
},
128+
{
129+
ResourceIdentifier: workv1.ResourceIdentifier{
130+
Group: "apps",
131+
Resource: "deployments",
132+
Name: "test-deployment",
133+
Namespace: "default",
134+
},
135+
Version: "v1",
136+
UID: "deployment-uid-456",
137+
},
138+
},
139+
}
140+
141+
updatedWork, err := hubWorkClient.WorkV1().AppliedManifestWorks().UpdateStatus(context.TODO(), appliedManifestWork, metav1.UpdateOptions{})
142+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
143+
gomega.Expect(len(updatedWork.Status.AppliedResources)).Should(gomega.Equal(2))
144+
})
145+
})
146+
147+
ginkgo.Context("AppliedManifestWork validation edge cases", func() {
148+
ginkgo.It("should create with required fields", func() {
149+
appliedWork := &workv1.AppliedManifestWork{
150+
ObjectMeta: metav1.ObjectMeta{
151+
Name: appliedManifestWorkName,
152+
},
153+
Spec: workv1.AppliedManifestWorkSpec{
154+
HubHash: "test-hub-hash",
155+
AgentID: "test-agent",
156+
ManifestWorkName: "test-manifestwork",
157+
},
158+
}
159+
160+
createdAppliedWork, err := hubWorkClient.WorkV1().AppliedManifestWorks().Create(context.TODO(), appliedWork, metav1.CreateOptions{})
161+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
162+
gomega.Expect(createdAppliedWork.Spec.HubHash).Should(gomega.Equal("test-hub-hash"))
163+
gomega.Expect(createdAppliedWork.Spec.AgentID).Should(gomega.Equal("test-agent"))
164+
})
165+
166+
ginkgo.It("should handle empty applied resources list", func() {
167+
appliedWork := &workv1.AppliedManifestWork{
168+
ObjectMeta: metav1.ObjectMeta{
169+
Name: appliedManifestWorkName,
170+
},
171+
Spec: workv1.AppliedManifestWorkSpec{
172+
HubHash: "test-hub-hash",
173+
AgentID: "test-agent",
174+
ManifestWorkName: "test-manifestwork",
175+
},
176+
}
177+
178+
appliedManifestWork, err := hubWorkClient.WorkV1().AppliedManifestWorks().Create(context.TODO(), appliedWork, metav1.CreateOptions{})
179+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
180+
gomega.Expect(appliedManifestWork.Spec.HubHash).Should(gomega.Equal("test-hub-hash"))
181+
})
182+
})
183+
})

‎test/integration/api/clustermanager_test.go‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
. "github.com/onsi/ginkgo"
99
. "github.com/onsi/gomega"
10+
v1 "k8s.io/api/core/v1"
1011
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1112
"k8s.io/apimachinery/pkg/util/rand"
1213
operatorv1 "open-cluster-management.io/api/operator/v1"
@@ -410,3 +411,180 @@ var _ = Describe("ClusterManager API test with WorkConfiguration", func() {
410411
Expect(clusterManager.Spec.WorkConfiguration.FeatureGates[1].Mode).Should(Equal(operatorv1.FeatureGateModeTypeEnable))
411412
})
412413
})
414+
415+
var _ = Describe("ClusterManager v1 Enhanced API test", func() {
416+
var clusterManagerName string
417+
418+
BeforeEach(func() {
419+
suffix := rand.String(5)
420+
clusterManagerName = fmt.Sprintf("cm-enhanced-%s", suffix)
421+
})
422+
423+
AfterEach(func() {
424+
err := operatorClient.OperatorV1().ClusterManagers().Delete(context.TODO(), clusterManagerName, metav1.DeleteOptions{})
425+
if err != nil {
426+
// Ignore not found errors in cleanup
427+
}
428+
})
429+
430+
Context("ClusterManager comprehensive configuration validation", func() {
431+
It("should handle complete configuration with all optional fields", func() {
432+
clusterManager := &operatorv1.ClusterManager{
433+
ObjectMeta: metav1.ObjectMeta{
434+
Name: clusterManagerName,
435+
},
436+
Spec: operatorv1.ClusterManagerSpec{
437+
RegistrationImagePullSpec: "quay.io/test/registration:latest",
438+
WorkImagePullSpec: "quay.io/test/work:latest",
439+
PlacementImagePullSpec: "quay.io/test/placement:latest",
440+
AddOnManagerImagePullSpec: "quay.io/test/addon-manager:latest",
441+
NodePlacement: operatorv1.NodePlacement{
442+
NodeSelector: map[string]string{
443+
"node-role.kubernetes.io/infra": "",
444+
},
445+
Tolerations: []v1.Toleration{
446+
{
447+
Key: "node-role.kubernetes.io/infra",
448+
Operator: v1.TolerationOpExists,
449+
Effect: v1.TaintEffectNoSchedule,
450+
},
451+
},
452+
},
453+
DeployOption: operatorv1.ClusterManagerDeployOption{
454+
Mode: operatorv1.InstallModeDefault,
455+
},
456+
RegistrationConfiguration: &operatorv1.RegistrationHubConfiguration{
457+
AutoApproveUsers: []string{"system:admin"},
458+
FeatureGates: []operatorv1.FeatureGate{
459+
{
460+
Feature: "DefaultClusterSet",
461+
Mode: operatorv1.FeatureGateModeTypeEnable,
462+
},
463+
},
464+
},
465+
WorkConfiguration: &operatorv1.WorkConfiguration{
466+
WorkDriver: operatorv1.WorkDriverTypeKube,
467+
FeatureGates: []operatorv1.FeatureGate{
468+
{
469+
Feature: "ManifestWorkReplicaSet",
470+
Mode: operatorv1.FeatureGateModeTypeEnable,
471+
},
472+
},
473+
},
474+
},
475+
}
476+
477+
createdClusterManager, err := operatorClient.OperatorV1().ClusterManagers().Create(context.TODO(), clusterManager, metav1.CreateOptions{})
478+
Expect(err).ToNot(HaveOccurred())
479+
Expect(createdClusterManager.Spec.NodePlacement.NodeSelector["node-role.kubernetes.io/infra"]).Should(Equal(""))
480+
Expect(len(createdClusterManager.Spec.NodePlacement.Tolerations)).Should(Equal(1))
481+
Expect(createdClusterManager.Spec.RegistrationConfiguration.FeatureGates[0].Mode).Should(Equal(operatorv1.FeatureGateModeTypeEnable))
482+
Expect(createdClusterManager.Spec.WorkConfiguration.FeatureGates[0].Mode).Should(Equal(operatorv1.FeatureGateModeTypeEnable))
483+
})
484+
485+
It("should validate addon manager configuration", func() {
486+
clusterManager := &operatorv1.ClusterManager{
487+
ObjectMeta: metav1.ObjectMeta{
488+
Name: clusterManagerName,
489+
},
490+
Spec: operatorv1.ClusterManagerSpec{
491+
AddOnManagerConfiguration: &operatorv1.AddOnManagerConfiguration{
492+
FeatureGates: []operatorv1.FeatureGate{
493+
{
494+
Feature: "AddonManagement",
495+
Mode: operatorv1.FeatureGateModeTypeEnable,
496+
},
497+
},
498+
},
499+
},
500+
}
501+
502+
createdClusterManager, err := operatorClient.OperatorV1().ClusterManagers().Create(context.TODO(), clusterManager, metav1.CreateOptions{})
503+
Expect(err).ToNot(HaveOccurred())
504+
Expect(createdClusterManager.Spec.AddOnManagerConfiguration.FeatureGates[0].Feature).Should(Equal("AddonManagement"))
505+
})
506+
507+
It("should validate server configuration", func() {
508+
clusterManager := &operatorv1.ClusterManager{
509+
ObjectMeta: metav1.ObjectMeta{
510+
Name: clusterManagerName,
511+
},
512+
Spec: operatorv1.ClusterManagerSpec{
513+
ServerConfiguration: &operatorv1.ServerConfiguration{},
514+
},
515+
}
516+
517+
createdClusterManager, err := operatorClient.OperatorV1().ClusterManagers().Create(context.TODO(), clusterManager, metav1.CreateOptions{})
518+
Expect(err).ToNot(HaveOccurred())
519+
Expect(createdClusterManager.Spec.ServerConfiguration).ShouldNot(BeNil())
520+
})
521+
})
522+
523+
Context("ClusterManager resource requirements", func() {
524+
It("should handle resource requirements configuration", func() {
525+
clusterManager := &operatorv1.ClusterManager{
526+
ObjectMeta: metav1.ObjectMeta{
527+
Name: clusterManagerName,
528+
},
529+
Spec: operatorv1.ClusterManagerSpec{
530+
ResourceRequirement: &operatorv1.ResourceRequirement{
531+
Type: operatorv1.ResourceQosClassResourceRequirement,
532+
},
533+
},
534+
}
535+
536+
createdClusterManager, err := operatorClient.OperatorV1().ClusterManagers().Create(context.TODO(), clusterManager, metav1.CreateOptions{})
537+
Expect(err).ToNot(HaveOccurred())
538+
Expect(createdClusterManager.Spec.ResourceRequirement.Type).Should(Equal(operatorv1.ResourceQosClassResourceRequirement))
539+
})
540+
})
541+
542+
Context("ClusterManager status updates", func() {
543+
It("should allow status updates", func() {
544+
clusterManager := &operatorv1.ClusterManager{
545+
ObjectMeta: metav1.ObjectMeta{
546+
Name: clusterManagerName,
547+
},
548+
Spec: operatorv1.ClusterManagerSpec{},
549+
}
550+
551+
createdClusterManager, err := operatorClient.OperatorV1().ClusterManagers().Create(context.TODO(), clusterManager, metav1.CreateOptions{})
552+
Expect(err).ToNot(HaveOccurred())
553+
554+
// Update status
555+
createdClusterManager.Status = operatorv1.ClusterManagerStatus{
556+
ObservedGeneration: 1,
557+
Conditions: []metav1.Condition{
558+
{
559+
Type: "Applied",
560+
Status: metav1.ConditionTrue,
561+
Reason: "ClusterManagerDeployed",
562+
LastTransitionTime: metav1.Now(),
563+
},
564+
},
565+
Generations: []operatorv1.GenerationStatus{
566+
{
567+
Group: "apps",
568+
Version: "v1",
569+
Resource: "deployments",
570+
Namespace: "open-cluster-management-hub",
571+
Name: "cluster-manager-registration-controller",
572+
LastGeneration: 1,
573+
},
574+
},
575+
RelatedResources: []operatorv1.RelatedResourceMeta{
576+
{
577+
Group: "apps",
578+
Version: "v1",
579+
Resource: "deployments",
580+
Namespace: "open-cluster-management-hub",
581+
Name: "cluster-manager-registration-controller",
582+
},
583+
},
584+
}
585+
586+
_, err = operatorClient.OperatorV1().ClusterManagers().UpdateStatus(context.TODO(), createdClusterManager, metav1.UpdateOptions{})
587+
Expect(err).ToNot(HaveOccurred())
588+
})
589+
})
590+
})

0 commit comments

Comments
 (0)