Skip to content

Commit b462171

Browse files
nXtCyberNetnXtCyberNet
committed
add inline event assertions for propagationpolicy propagation
Signed-off-by: nXtCyberNet <rohantech2005@gmail.com> removed get-docker.sh Signed-off-by: nXtCyberNet <rohantech2005@gmail.com> updated overridepolicity_test to add overridepolicysucceed flag Signed-off-by: nXtCyberNet <rohantech2005@gmail.com> changed to passes the lint test Signed-off-by: nXtCyberNet <rohantech2005@gmail.com> removed the waitventv1fitwith function Signed-off-by: nXtCyberNet <rohantech2005@gmail.com> added Signed-off-by: nXtCyberNet <rohantech2005@gmail.com>
1 parent a4babda commit b462171

File tree

4 files changed

+261
-55
lines changed

4 files changed

+261
-55
lines changed

‎test/e2e/suites/base/dependenciesdistributor_test.go‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ var _ = ginkgo.Describe("[DependenciesDistributor] automatically propagate relev
113113
return true
114114
})
115115
})
116+
ginkgo.By("checking GetDependenciesSucceed event on deployment", func() {
117+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
118+
func(event corev1.Event) bool {
119+
return event.Reason == events.EventReasonGetDependenciesSucceed
120+
})
121+
})
116122

117123
ginkgo.By("updating propagation policy's clusterNames", func() {
118124
patch := []map[string]any{
@@ -206,6 +212,13 @@ var _ = ginkgo.Describe("[DependenciesDistributor] automatically propagate relev
206212
func(*corev1.Secret) bool {
207213
return true
208214
})
215+
216+
ginkgo.By("checking GetDependenciesSucceed event on deployment", func() {
217+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
218+
func(event corev1.Event) bool {
219+
return event.Reason == events.EventReasonGetDependenciesSucceed
220+
})
221+
})
209222
})
210223

211224
ginkgo.By("make the secret is not referenced by the deployment ", func() {
@@ -276,13 +289,19 @@ var _ = ginkgo.Describe("[DependenciesDistributor] automatically propagate relev
276289
func(*appsv1.Deployment) bool {
277290
return true
278291
})
279-
280292
framework.WaitPVCPresentOnClustersFitWith(initClusterNames, pvc.GetNamespace(), pvc.GetName(),
281293
func(*corev1.PersistentVolumeClaim) bool {
282294
return true
283295
})
284296
})
285297

298+
ginkgo.By("checking GetDependenciesSucceed event on deployment", func() {
299+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
300+
func(event corev1.Event) bool {
301+
return event.Reason == events.EventReasonGetDependenciesSucceed
302+
})
303+
})
304+
286305
ginkgo.By("make the persistentVolumeClaim is not referenced by the deployment ", func() {
287306
updateVolumes := []corev1.Volume{
288307
{
@@ -343,6 +362,12 @@ var _ = ginkgo.Describe("[DependenciesDistributor] automatically propagate relev
343362
return true
344363
})
345364
})
365+
ginkgo.By("checking GetDependenciesSucceed event on deployment", func() {
366+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
367+
func(event corev1.Event) bool {
368+
return event.Reason == events.EventReasonGetDependenciesSucceed
369+
})
370+
})
346371

347372
ginkgo.By("make the sa is not referenced by the deployment ", func() {
348373
framework.UpdateDeploymentServiceAccountName(kubeClient, deployment, "default")
@@ -683,6 +708,13 @@ var _ = ginkgo.Describe("[DependenciesDistributor] automatically propagate relev
683708
})
684709
})
685710

711+
ginkgo.By("checking GetDependenciesSucceed event on deployment", func() {
712+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
713+
func(event corev1.Event) bool {
714+
return event.Reason == events.EventReasonGetDependenciesSucceed
715+
})
716+
})
717+
686718
ginkgo.By("updating propagation policy's clusterNames", func() {
687719
patch := []map[string]any{
688720
{

‎test/e2e/suites/base/overridepolicy_test.go‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/klog/v2"
2929

3030
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
31+
"github.com/karmada-io/karmada/pkg/events"
3132
"github.com/karmada-io/karmada/test/e2e/framework"
3233
"github.com/karmada-io/karmada/test/helper"
3334
)
@@ -113,6 +114,12 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
113114

114115
ginkgo.It("deployment labelsOverride testing", func() {
115116
klog.Infof("check if deployment present on member clusters have correct labels value")
117+
ginkgo.By("checking ApplyOverridePolicySucceed event on deployment", func() {
118+
framework.WaitEventFitWith(kubeClient, deploymentNamespace, deploymentName,
119+
func(event corev1.Event) bool {
120+
return event.Reason == events.EventReasonApplyOverridePolicySucceed
121+
})
122+
})
116123
framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name,
117124
func(deployment *appsv1.Deployment) bool {
118125
_, labelBarExist := deployment.GetLabels()["bar"]
@@ -121,6 +128,7 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
121128
deployment.GetLabels()["foo"] == "exist" &&
122129
deployment.GetLabels()["app"] == "nginx"
123130
})
131+
124132
})
125133
})
126134
ginkgo.Context("[AnnotationsOverrider] apply annotations overrider testing", func() {
@@ -284,6 +292,13 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
284292
}
285293
return true
286294
})
295+
296+
ginkgo.By("checking ApplyOverridePolicySucceed event", func() {
297+
framework.WaitEventFitWith(kubeClient, deploymentNamespace, deploymentName,
298+
func(event corev1.Event) bool {
299+
return event.Reason == events.EventReasonApplyOverridePolicySucceed
300+
})
301+
})
287302
})
288303
})
289304

@@ -427,6 +442,13 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
427442
func(deployment *appsv1.Deployment) bool {
428443
return deployment.Spec.Template.Spec.Containers[0].Image == "fictional.registry.us/nginx:1.19.0"
429444
})
445+
446+
ginkgo.By("checking ApplyOverridePolicySucceed event", func() {
447+
framework.WaitEventFitWith(kubeClient, deploymentNamespace, deploymentName,
448+
func(event corev1.Event) bool {
449+
return event.Reason == events.EventReasonApplyOverridePolicySucceed
450+
})
451+
})
430452
})
431453
})
432454

@@ -708,6 +730,13 @@ var _ = framework.SerialDescribe("OverridePolicy with nil resourceSelector testi
708730
func(deployment *appsv1.Deployment) bool {
709731
return deployment.Spec.Template.Spec.Containers[0].Image == "fictional.registry.us/nginx:1.19.0"
710732
})
733+
734+
ginkgo.By("checking ApplyOverridePolicySucceed event", func() {
735+
framework.WaitEventFitWith(kubeClient, deploymentNamespace, deploymentName,
736+
func(event corev1.Event) bool {
737+
return event.Reason == events.EventReasonApplyOverridePolicySucceed
738+
})
739+
})
711740
})
712741
})
713742
})
@@ -798,6 +827,12 @@ var _ = ginkgo.Describe("[OverrideRules] apply overriders testing", func() {
798827
}
799828
return true
800829
})
830+
ginkgo.By("checking ApplyOverridePolicySucceed event", func() {
831+
framework.WaitEventFitWith(kubeClient, deploymentNamespace, deploymentName,
832+
func(event corev1.Event) bool {
833+
return event.Reason == events.EventReasonApplyOverridePolicySucceed
834+
})
835+
})
801836
})
802837
})
803838

@@ -881,6 +916,7 @@ var _ = ginkgo.Describe("[OverrideRules] apply overriders testing", func() {
881916
return true
882917
})
883918
})
919+
884920
})
885921

886922
ginkgo.Context("Deployment override specific images in container list", func() {
@@ -951,6 +987,12 @@ var _ = ginkgo.Describe("[OverrideRules] apply overriders testing", func() {
951987
func(deployment *appsv1.Deployment) bool {
952988
return deployment.Spec.Template.Spec.Containers[0].Image == "fictional.registry.us/nginx:1.19.0"
953989
})
990+
ginkgo.By("checking ApplyOverridePolicySucceed event", func() {
991+
framework.WaitEventFitWith(kubeClient, deploymentNamespace, deploymentName,
992+
func(event corev1.Event) bool {
993+
return event.Reason == events.EventReasonApplyOverridePolicySucceed
994+
})
995+
})
954996
})
955997
})
956998
})

‎test/e2e/suites/base/preemption_test.go‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ package base
1919
import (
2020
"github.com/onsi/ginkgo/v2"
2121
appsv1 "k8s.io/api/apps/v1"
22+
corev1 "k8s.io/api/core/v1"
2223
"k8s.io/apimachinery/pkg/types"
2324
"k8s.io/apimachinery/pkg/util/rand"
2425
"k8s.io/utils/ptr"
2526

2627
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
28+
"github.com/karmada-io/karmada/pkg/events"
2729
"github.com/karmada-io/karmada/test/e2e/framework"
2830
testhelper "github.com/karmada-io/karmada/test/helper"
2931
)
@@ -87,6 +89,12 @@ var _ = ginkgo.Describe("[Preemption] propagation policy preemption testing", fu
8789
framework.CreatePropagationPolicy(karmadaClient, highPriorityPolicy)
8890
framework.WaitDeploymentPresentOnClusterFitWith(preemptingClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
8991
})
92+
ginkgo.By("checking PreemptPolicySucceed event on deployment", func() {
93+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
94+
func(event corev1.Event) bool {
95+
return event.Reason == events.EventReasonPreemptPolicySucceed
96+
})
97+
})
9098

9199
ginkgo.By("Delete the high-priority PropagationPolicy to let the low-priority PropagationPolicy preempt the deployment", func() {
92100
framework.RemovePropagationPolicy(karmadaClient, highPriorityPolicy.Namespace, highPriorityPolicy.Name)
@@ -139,6 +147,7 @@ var _ = ginkgo.Describe("[Preemption] propagation policy preemption testing", fu
139147

140148
ginkgo.It("Propagate the deployment with the ClusterPropagationPolicy and then create the PropagationPolicy to preempt it", func() {
141149
ginkgo.By("Wait for propagating deployment by the ClusterPropagationPolicy", func() {
150+
142151
framework.WaitDeploymentPresentOnClusterFitWith(preemptedClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
143152
})
144153

@@ -147,6 +156,13 @@ var _ = ginkgo.Describe("[Preemption] propagation policy preemption testing", fu
147156
framework.WaitDeploymentPresentOnClusterFitWith(preemptingClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
148157
})
149158

159+
ginkgo.By("checking PreemptPolicySucceed event on deployment", func() {
160+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
161+
func(event corev1.Event) bool {
162+
return event.Reason == events.EventReasonPreemptPolicySucceed
163+
})
164+
})
165+
150166
ginkgo.By("Delete the PropagationPolicy to let the ClusterPropagationPolicy preempt the deployment", func() {
151167
framework.RemovePropagationPolicy(karmadaClient, propagationPolicy.Namespace, propagationPolicy.Name)
152168
framework.WaitDeploymentPresentOnClusterFitWith(preemptedClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
@@ -216,6 +232,13 @@ var _ = ginkgo.Describe("[Preemption] propagation policy preemption testing", fu
216232
framework.PatchPropagationPolicy(karmadaClient, highPriorityPolicy.Namespace, highPriorityPolicy.Name, patch, types.JSONPatchType)
217233
framework.WaitDeploymentPresentOnClusterFitWith(preemptingClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
218234
})
235+
236+
ginkgo.By("checking PreemptPolicySucceed event on deployment", func() {
237+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
238+
func(event corev1.Event) bool {
239+
return event.Reason == events.EventReasonPreemptPolicySucceed
240+
})
241+
})
219242
})
220243
})
221244
})
@@ -272,6 +295,13 @@ var _ = ginkgo.Describe("[Preemption] propagation policy preemption testing", fu
272295
framework.WaitDeploymentPresentOnClusterFitWith(preemptingClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
273296
})
274297

298+
ginkgo.By("checking PreemptPolicySucceed event on deployment", func() {
299+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
300+
func(event corev1.Event) bool {
301+
return event.Reason == events.EventReasonPreemptPolicySucceed
302+
})
303+
})
304+
275305
ginkgo.By("Delete the high-priority ClusterPropagationPolicy to let the low-priority ClusterPropagationPolicy preempt the deployment", func() {
276306
framework.RemoveClusterPropagationPolicy(karmadaClient, highPriorityPolicy.Name)
277307
framework.WaitDeploymentPresentOnClusterFitWith(preemptedClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
@@ -341,6 +371,13 @@ var _ = ginkgo.Describe("[Preemption] propagation policy preemption testing", fu
341371
framework.PatchClusterPropagationPolicy(karmadaClient, highPriorityPolicy.Name, patch, types.JSONPatchType)
342372
framework.WaitDeploymentPresentOnClusterFitWith(preemptingClusterName, deployment.Namespace, deployment.Name, func(*appsv1.Deployment) bool { return true })
343373
})
374+
375+
ginkgo.By("checking PreemptPolicySucceed event on deployment", func() {
376+
framework.WaitEventFitWith(kubeClient, deployment.Namespace, deployment.Name,
377+
func(event corev1.Event) bool {
378+
return event.Reason == events.EventReasonPreemptPolicySucceed
379+
})
380+
})
344381
})
345382
})
346383
})

0 commit comments

Comments
 (0)