Skip to content

test: drift detection and takeover implementation (2/) #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanzhang-oss merged 1 commit into from
Jan 13, 2025
Merged

test: drift detection and takeover implementation (2/) #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
221 changes: 0 additions & 221 deletions pkg/controllers/workapplier/controller_integration_migrated_2_test.go
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions pkg/controllers/workapplier/controller_integration_migrated_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
)

// createWorkWithManifest creates a work given a manifest
func createWorkWithManifest(workNamespace string, manifest runtime.Object) *fleetv1beta1.Work {
func createWorkWithManifest(manifest runtime.Object) *fleetv1beta1.Work {
manifestCopy := manifest.DeepCopyObject()
newWork := fleetv1beta1.Work{
ObjectMeta: metav1.ObjectMeta{
Name: "work-" + utilrand.String(5),
Namespace: workNamespace,
Namespace: memberReservedNSName,
},
Spec: fleetv1beta1.WorkSpec{
Workload: fleetv1beta1.WorkloadTemplate{
Expand All @@ -48,7 +48,7 @@ func createWorkWithManifest(workNamespace string, manifest runtime.Object) *flee
// verifyAppliedConfigMap verifies that the applied CM is the same as the CM we want to apply
func verifyAppliedConfigMap(cm *corev1.ConfigMap) *corev1.ConfigMap {
var appliedCM corev1.ConfigMap
Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: cm.GetName(), Namespace: cm.GetNamespace()}, &appliedCM)).Should(Succeed())
Expect(memberClient.Get(context.Background(), types.NamespacedName{Name: cm.GetName(), Namespace: cm.GetNamespace()}, &appliedCM)).Should(Succeed())

By("Check the config map label")
Expect(cmp.Diff(appliedCM.Labels, cm.Labels)).Should(BeEmpty())
Expand All @@ -67,10 +67,10 @@ func verifyAppliedConfigMap(cm *corev1.ConfigMap) *corev1.ConfigMap {
}

// waitForWorkToApply waits for a work to be applied
func waitForWorkToApply(workName, workNS string) *fleetv1beta1.Work {
func waitForWorkToApply(workName string) *fleetv1beta1.Work {
var resultWork fleetv1beta1.Work
Eventually(func() bool {
err := k8sClient.Get(context.Background(), types.NamespacedName{Name: workName, Namespace: workNS}, &resultWork)
err := hubClient.Get(context.Background(), types.NamespacedName{Name: workName, Namespace: memberReservedNSName}, &resultWork)
if err != nil {
return false
}
Expand All @@ -86,15 +86,15 @@ func waitForWorkToApply(workName, workNS string) *fleetv1beta1.Work {
}
}
return true
}, timeout, interval).Should(BeTrue())
}, eventuallyDuration, eventuallyInterval).Should(BeTrue())
return &resultWork
}

// waitForWorkToAvailable waits for a work to have an available condition to be true
func waitForWorkToBeAvailable(workName, workNS string) *fleetv1beta1.Work {
func waitForWorkToBeAvailable(workName string) *fleetv1beta1.Work {
var resultWork fleetv1beta1.Work
Eventually(func() bool {
err := k8sClient.Get(context.Background(), types.NamespacedName{Name: workName, Namespace: workNS}, &resultWork)
err := hubClient.Get(context.Background(), types.NamespacedName{Name: workName, Namespace: memberReservedNSName}, &resultWork)
if err != nil {
return false
}
Expand All @@ -110,19 +110,19 @@ func waitForWorkToBeAvailable(workName, workNS string) *fleetv1beta1.Work {
}
}
return true
}, timeout, interval).Should(BeTrue())
}, eventuallyDuration, eventuallyInterval).Should(BeTrue())
return &resultWork
}

// waitForWorkToBeHandled waits for a work to have a finalizer
func waitForWorkToBeHandled(workName, workNS string) *fleetv1beta1.Work {
var resultWork fleetv1beta1.Work
Eventually(func() bool {
err := k8sClient.Get(context.Background(), types.NamespacedName{Name: workName, Namespace: workNS}, &resultWork)
err := hubClient.Get(context.Background(), types.NamespacedName{Name: workName, Namespace: workNS}, &resultWork)
if err != nil {
return false
}
return controllerutil.ContainsFinalizer(&resultWork, fleetv1beta1.WorkFinalizer)
}, timeout, interval).Should(BeTrue())
}, eventuallyDuration, eventuallyInterval).Should(BeTrue())
return &resultWork
}
Loading