Skip to content
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

Jump to bottom

fix: add watcher for job and avoid unnecessary reconcile #527

Merged
merged 1 commit into from
Jul 19, 2024
Merged

fix: add watcher for job and avoid unnecessary reconcile #527

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
11 changes: 11 additions & 0 deletions pkg/controllers/workspace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
"github.com/samber/lo"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
"k8s.io/klog/v2"
"k8s.io/utils/clock"
"knative.dev/pkg/apis"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand Down Expand Up @@ -635,6 +637,7 @@
For(&kaitov1alpha1.Workspace{}).
Owns(&appsv1.Deployment{}).
Owns(&appsv1.StatefulSet{}).
Owns(&batchv1.Job{}).

Check warning on line 640 in pkg/controllers/workspace_controller.go

View check run for this annotation

Codecov / codecov/patch

pkg/controllers/workspace_controller.go#L640 

Added line #L640 was not covered by tests
Watches(&v1alpha5.Machine{}, c.watchMachines()).
WithOptions(controller.Options{MaxConcurrentReconciles: 5})

Expand All @@ -658,6 +661,14 @@
if !ok {
return nil
}
_, conditionFound := lo.Find(machineObj.GetConditions(), func(condition apis.Condition) bool {
return condition.Type == apis.ConditionReady &&
condition.Status == v1.ConditionTrue
})
if conditionFound && machineObj.DeletionTimestamp.IsZero() {

Check warning on line 668 in pkg/controllers/workspace_controller.go

View check run for this annotation

Codecov / codecov/patch

pkg/controllers/workspace_controller.go#L664-L668 

Added lines #L664 - L668 were not covered by tests
// No need to reconcile workspace if the machine is in READY state unless machine is deleted.
return nil

Check warning on line 670 in pkg/controllers/workspace_controller.go

View check run for this annotation

Codecov / codecov/patch

pkg/controllers/workspace_controller.go#L670 

Added line #L670 was not covered by tests
}
return []reconcile.Request{
{
NamespacedName: client.ObjectKey{
Expand Down
Loading