Skip to content

fix(operator): tolerate missing KEDA when cleaning up ScaledObject (#981) #985

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

Open
Anai-Guo wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

fix(operator): tolerate missing KEDA when cleaning up ScaledObject (#981) #985

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
9 changes: 8 additions & 1 deletion operator/internal/controller/vllmruntime_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -363,7 +364,13 @@ func (r *VLLMRuntimeReconciler) Reconcile(
scaledObject.SetKind("ScaledObject")
scaledObject.SetName(vllmRuntime.Name + "-scaledobject")
scaledObject.SetNamespace(vllmRuntime.Namespace)
if err := r.Delete(ctx, scaledObject); err != nil && !errors.IsNotFound(err) {
// Best-effort cleanup of a stale ScaledObject when autoscaling is
// disabled. Tolerate IsNoMatchError so the reconcile still succeeds on
// clusters where KEDA is not installed (the keda.sh API group is not
// registered): there is nothing to delete, and requiring KEDA here
// would make the operator unusable on non-autoscaling clusters.
if err := r.Delete(ctx, scaledObject); err != nil &&
!errors.IsNotFound(err) && !meta.IsNoMatchError(err) {
log.Error(err, "Failed to delete ScaledObject")
return ctrl.Result{}, err
}
Expand Down
Loading