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

csm sync issue fixed #259

Merged
merged 3 commits into from
Jun 5, 2023
Merged

csm sync issue fixed #259

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67535c6
csm sync issue fixed
jooseppi-luna May 30, 2023
45f1469
Merge branch 'main' into fix-failed-state
jooseppi-luna Jun 2, 2023
af51c88
Merge branch 'main' into fix-failed-state
jooseppi-luna Jun 5, 2023
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
35 changes: 24 additions & 11 deletions pkg/utils/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

t1 "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
)
Expand Down Expand Up @@ -293,20 +294,32 @@ func UpdateStatus(ctx context.Context, instance *csmv1.ContainerStorageModule, r
newStatus.ControllerStatus, "Node", newStatus.NodeStatus)

_, merr := calculateState(ctx, instance, r, newStatus)
csm := new(csmv1.ContainerStorageModule)
err := r.GetClient().Get(ctx, t1.NamespacedName{Name: instance.Name,
Namespace: instance.GetNamespace()}, csm)

err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
log := logger.GetLogger(ctx)

csm := new(csmv1.ContainerStorageModule)
err := r.GetClient().Get(ctx, t1.NamespacedName{Name: instance.Name,
Namespace: instance.GetNamespace()}, csm)
if err != nil {
return err
}

log.Infow("instance - new controller Status", "desired", instance.Status.ControllerStatus.Desired)
log.Infow("instance - new controller Status", "Available", instance.Status.ControllerStatus.Available)
log.Infow("instance - new controller Status", "numberUnavailable", instance.Status.ControllerStatus.Failed)
log.Infow("instance - new controller Status", "State", instance.Status.State)

csm.Status = instance.Status
err = r.GetClient().Status().Update(ctx, csm)
return err
})
if err != nil {
// May be conflict if max retries were hit, or may be something unrelated
// like permissions or a network error
log.Error(err, " Failed to update CR status")
return err
}

log.Infow("instance - new controller Status", "desired", instance.Status.ControllerStatus.Desired)
log.Infow("instance - new controller Status", "Available", instance.Status.ControllerStatus.Available)
log.Infow("instance - new controller Status", "numberUnavailable", instance.Status.ControllerStatus.Failed)
log.Infow("instance - new controller Status", "State", instance.Status.State)

csm.Status = instance.Status
err = r.GetClient().Status().Update(ctx, csm)
if err != nil {
log.Error(err, " Failed to update CR status")
return err
Expand Down