Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-23 08:20:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

operator: requeue scaling group on conflict

Browse Source
This commit is contained in:
Leonard Cohnen 2024-10-20 22:14:13 +02:00 committed by Markus Rudy
parent 11c02980be
commit 7fbdba5b4d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
operators/constellation-node-operator/controllers/scalinggroup_controller.go
View File

@ -10,6 +10,7 @@ import (
"context" "context"
"strings" "strings"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
@ -92,8 +93,10 @@ func (r *ScalingGroupReconciler) Reconcile(ctx context.Context, req ctrl.Request
} }
meta.SetStatusCondition(&desiredScalingGroup.Status.Conditions, outdatedCondition) meta.SetStatusCondition(&desiredScalingGroup.Status.Conditions, outdatedCondition)
if err := r.Status().Update(ctx, &desiredScalingGroup); err != nil { if err := r.Status().Update(ctx, &desiredScalingGroup); err != nil {
logr.Error(err, "Unable to update AutoscalingStrategy status") if !k8sErrors.IsConflict(err) {
return ctrl.Result{}, err logr.Error(err, "Unable to update Scaling Group status")
}
return ctrl.Result{Requeue: true}, err
} }
if !imagesMatch { if !imagesMatch {