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

Fix- When removing all services from a cluster deployment the services remain deployed #1141

Merged
merged 4 commits into from
Mar 7, 2025
Merged

Fix- When removing all services from a cluster deployment the services remain deployed #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85e71bc
If there are no services present in the cluster deployment, delete th…
kylewuolle Feb 28, 2025
0c57078
Add check for service length prior to profile reconciliation. Added s…
kylewuolle Mar 5, 2025
1859518
Remove the deletion of the sveltos profile
kylewuolle Mar 5, 2025
0ac589e
fix linting error
kylewuolle Mar 6, 2025
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
16 changes: 10 additions & 6 deletions internal/controller/clusterdeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,13 +602,17 @@ func (r *ClusterDeploymentReconciler) updateServices(ctx context.Context, mc *kc
return ctrl.Result{}, nil
}

var servicesStatus []kcm.ServiceStatus
servicesStatus, servicesErr = updateServicesStatus(ctx, r.Client, profileRef, profile.Status.MatchingClusterRefs, mc.Status.Services)
if servicesErr != nil {
return ctrl.Result{}, nil
if len(mc.Spec.ServiceSpec.Services) == 0 {
mc.Status.Services = nil
} else {
var servicesStatus []kcm.ServiceStatus
servicesStatus, servicesErr = updateServicesStatus(ctx, r.Client, profileRef, profile.Status.MatchingClusterRefs, mc.Status.Services)
if servicesErr != nil {
return ctrl.Result{}, nil
}
mc.Status.Services = servicesStatus
l.Info("Successfully updated status of services")
}
mc.Status.Services = servicesStatus
l.Info("Successfully updated status of services")

return ctrl.Result{}, nil
}
Expand Down
15 changes: 9 additions & 6 deletions internal/controller/multiclusterservice_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,16 @@ func (r *MultiClusterServiceReconciler) reconcileUpdate(ctx context.Context, mcs
return ctrl.Result{}, nil
}

var servicesStatus []kcm.ServiceStatus
servicesStatus, servicesErr = updateServicesStatus(ctx, r.Client, profileRef, profile.Status.MatchingClusterRefs, mcs.Status.Services)
if servicesErr != nil {
return ctrl.Result{}, nil
if len(mcs.Spec.ServiceSpec.Services) == 0 {
mcs.Status.Services = nil
} else {
var servicesStatus []kcm.ServiceStatus
servicesStatus, servicesErr = updateServicesStatus(ctx, r.Client, profileRef, profile.Status.MatchingClusterRefs, mcs.Status.Services)
if servicesErr != nil {
return ctrl.Result{}, nil
}
mcs.Status.Services = servicesStatus
}
mcs.Status.Services = servicesStatus

return ctrl.Result{}, nil
}

Expand Down