Skip to content

(bug) Optmize classifier reconciliations #426

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

Merged
gianlucam76 merged 1 commit into from
Dec 20, 2025
Merged

(bug) Optmize classifier reconciliations #426

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ KIND := $(TOOLS_BIN_DIR)/kind
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl

GOLANGCI_LINT_VERSION := "v2.5.0"
CLUSTERCTL_VERSION := v1.12.0
GOLANGCI_LINT_VERSION := "v2.7.2"
CLUSTERCTL_VERSION := v1.12.1

KUSTOMIZE_VER := v5.7.0
KUSTOMIZE_BIN := kustomize
Expand Down Expand Up @@ -169,7 +169,7 @@ endif
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
# this default value is used
ifndef K8S_VERSION
K8S_VERSION := v1.34.0
K8S_VERSION := v1.35.0
endif

KIND_CONFIG ?= kind-cluster.yaml
Expand Down
15 changes: 8 additions & 7 deletions controllers/classifier_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (r *ClassifierReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}

logger := ctrl.LoggerFrom(ctx)
logger.V(logs.LogInfo).Info("Reconciling")
logger.V(logs.LogDebug).Info("Reconciling")

// Fecth the Classifier instance
classifier := &libsveltosv1beta1.Classifier{}
Expand Down Expand Up @@ -197,7 +197,7 @@ func (r *ClassifierReconciler) reconcileDelete(
) (reconcile.Result, error) {

logger := classifierScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Classifier delete")
logger.V(logs.LogDebug).Info("Reconciling Classifier delete")

err := r.removeAllRegistrations(ctx, classifierScope, logger)
if err != nil {
Expand Down Expand Up @@ -250,7 +250,7 @@ func (r *ClassifierReconciler) reconcileDelete(
controllerutil.RemoveFinalizer(classifierScope.Classifier, libsveltosv1beta1.ClassifierFinalizer)
}

logger.V(logs.LogInfo).Info("Reconcile delete success")
logger.V(logs.LogDebug).Info("Reconcile delete success")
return reconcile.Result{}, nil
}

Expand All @@ -260,7 +260,7 @@ func (r *ClassifierReconciler) reconcileNormal(
) (reconcile.Result, error) {

logger := classifierScope.Logger
logger.V(logs.LogInfo).Info("Reconciling Classifier")
logger.V(logs.LogDebug).Info("Reconciling Classifier")

if !controllerutil.ContainsFinalizer(classifierScope.Classifier, libsveltosv1beta1.ClassifierFinalizer) {
if err := r.addFinalizer(ctx, classifierScope); err != nil {
Expand Down Expand Up @@ -296,7 +296,7 @@ func (r *ClassifierReconciler) reconcileNormal(
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
}

logger.V(logs.LogInfo).Info("Reconcile success")
logger.V(logs.LogDebug).Info("Reconcile success")
return reconcile.Result{}, nil
}

Expand All @@ -308,7 +308,8 @@ func (r *ClassifierReconciler) SetupWithManager(ctx context.Context,
// all Classifier with at least one conflict needs to be reconciled

c, err := ctrl.NewControllerManagedBy(mgr).
For(&libsveltosv1beta1.Classifier{}).
For(&libsveltosv1beta1.Classifier{}, builder.WithPredicates(
ClassifierPredicate{Logger: mgr.GetLogger().WithValues("classifierPredicate")})).
WithOptions(controller.Options{
MaxConcurrentReconciles: r.ConcurrentReconciles,
}).
Expand All @@ -321,7 +322,7 @@ func (r *ClassifierReconciler) SetupWithManager(ctx context.Context,
Watches(&libsveltosv1beta1.Classifier{},
handler.EnqueueRequestsFromMapFunc(r.requeueClassifierForClassifier),
builder.WithPredicates(
ClassifierPredicate(mgr.GetLogger().WithValues("predicate", "classifiepredicate")),
OtherClassifierPredicate(mgr.GetLogger().WithValues("predicate", "otherClassifiepredicate")),
),
).
Watches(&libsveltosv1beta1.SveltosCluster{},
Expand Down
77 changes: 35 additions & 42 deletions controllers/classifier_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ func (r *ClassifierReconciler) undeployClassifier(ctx context.Context, classifie
_, err := clusterproxy.GetCluster(ctx, r.Client, c.Namespace, c.Name, clusterproxy.GetClusterType(c))
if err != nil {
if apierrors.IsNotFound(err) {
logger.V(logs.LogInfo).Info(fmt.Sprintf("cluster %s/%s does not exist", c.Namespace, c.Name))
logger.V(logs.LogDebug).Info(fmt.Sprintf("cluster %s/%s does not exist", c.Namespace, c.Name))
continue
}
logger.V(logs.LogInfo).Info("failed to get cluster")
logger.V(logs.LogInfo).Error(err, "failed to get cluster")
return err
}
clusters = append(clusters, c)
Expand Down Expand Up @@ -243,7 +243,7 @@ func getClassifierAndClusterClient(ctx context.Context, clusterNamespace, cluste
}

if !classifier.DeletionTimestamp.IsZero() {
logger.V(logs.LogInfo).Info("Classifier is marked for deletion. Nothing to do.")
logger.V(logs.LogDebug).Info("Classifier is marked for deletion. Nothing to do.")
// if classifier is marked for deletion, there is nothing to deploy
return nil, nil, fmt.Errorf("classifier is marked for deletion")
}
Expand All @@ -255,7 +255,7 @@ func getClassifierAndClusterClient(ctx context.Context, clusterNamespace, cluste
}

if !cluster.GetDeletionTimestamp().IsZero() {
logger.V(logs.LogInfo).Info("cluster is marked for deletion. Nothing to do.")
logger.V(logs.LogDebug).Info("cluster is marked for deletion. Nothing to do.")
// if cluster is marked for deletion, there is nothing to deploy
return nil, nil, fmt.Errorf("cluster is marked for deletion")
}
Expand Down Expand Up @@ -653,7 +653,7 @@ func undeployClassifierFromCluster(ctx context.Context, c client.Client,
}

if !cluster.GetDeletionTimestamp().IsZero() {
logger.V(logs.LogInfo).Info("cluster is marked for deletion. Nothing to do.")
logger.V(logs.LogDebug).Info("cluster is marked for deletion. Nothing to do.")
return nil
}

Expand Down Expand Up @@ -682,10 +682,10 @@ func undeployClassifierFromCluster(ctx context.Context, c client.Client,
err = remoteClient.Get(ctx, types.NamespacedName{Name: applicant}, currentClassifier)
if err != nil {
if apierrors.IsNotFound(err) {
logger.V(logs.LogInfo).Info("classifier not found")
logger.V(logs.LogDebug).Info("classifier not found")
return nil
}
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get classifier. Err: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get classifier")
return err
}

Expand Down Expand Up @@ -821,7 +821,7 @@ func (r *ClassifierReconciler) removeClassifier(ctx context.Context, classifierS
return err
}
if paused {
logger.V(logs.LogInfo).Info("cluster is paused. Do nothing.")
logger.V(logs.LogDebug).Info("cluster is paused. Do nothing.")
return nil
}

Expand Down Expand Up @@ -878,7 +878,7 @@ func (r *ClassifierReconciler) canProceed(ctx context.Context, classifierScope *
}

if !ready {
logger.V(logs.LogInfo).Info("Cluster is not ready yet")
logger.V(logs.LogDebug).Info("Cluster is not ready yet")
return false, nil
}

Expand Down Expand Up @@ -1004,7 +1004,7 @@ func (r *ClassifierReconciler) proceedProcessingClassifier(ctx context.Context,
var result deployer.Result

if isConfigSame {
logger.V(logs.LogInfo).Info("classifier and kubeconfig have not changed")
logger.V(logs.LogDebug).Info("classifier and kubeconfig have not changed")
result = r.Deployer.GetResult(ctx, cluster.Namespace, cluster.Name, classifier.Name, f.id,
clusterproxy.GetClusterType(cluster), false)
deployerStatus = r.convertResultStatus(result)
Expand Down Expand Up @@ -1036,11 +1036,11 @@ func (r *ClassifierReconciler) proceedProcessingClassifier(ctx context.Context,
return clusterInfo, fmt.Errorf("classifier is still being provisioned")
}
} else if isConfigSame && currentStatus != nil && *currentStatus == libsveltosv1beta1.SveltosStatusProvisioned {
logger.V(logs.LogInfo).Info("already deployed")
logger.V(logs.LogDebug).Info("already deployed")
s := libsveltosv1beta1.SveltosStatusProvisioned
deployerStatus = &s
} else {
logger.V(logs.LogInfo).Info("no result is available. queue job and mark status as provisioning")
logger.V(logs.LogDebug).Info("no result is available. queue job and mark status as provisioning")
s := libsveltosv1beta1.SveltosStatusProvisioning
deployerStatus = &s

Expand Down Expand Up @@ -1190,8 +1190,7 @@ func deployCRDInPullMode(ctx context.Context, clusterNamespace, clusterName, cla
err := pullmode.StageResourcesForDeployment(ctx, getManagementClusterClient(), clusterNamespace, clusterName,
libsveltosv1beta1.ClassifierKind, classifierName, libsveltosv1beta1.FeatureClassifier, resources, true, logger)
if err != nil {
logger.V(logs.LogInfo).Info(
fmt.Sprintf("failed to stage DebuggingConfiguration CRD: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to stage DebuggingConfiguration CRD")
return err
}
return nil
Expand All @@ -1209,7 +1208,7 @@ func applyCRD(ctx context.Context, clusterNamespace, clusterName string, u *unst

dr, err := k8s_utils.GetDynamicResourceInterface(remoteRestConfig, u.GroupVersionKind(), "")
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get dynamic client: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get dynamic client")
return err
}

Expand All @@ -1219,7 +1218,7 @@ func applyCRD(ctx context.Context, clusterNamespace, clusterName string, u *unst
}
_, err = dr.Apply(ctx, u.GetName(), u, options)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to apply Classifier CRD: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to apply Classifier CRD")
return err
}

Expand All @@ -1232,7 +1231,7 @@ func deployClassifierCRD(ctx context.Context, clusterNamespace, clusterName, cla

classifierCRD, err := k8s_utils.GetUnstructured(crd.GetClassifierCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get Classifier CRD unstructured: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get Classifier CRD unstructured")
return err
}

Expand All @@ -1249,8 +1248,7 @@ func deployClassifierReportCRD(ctx context.Context, clusterNamespace, clusterNam

classifierReportCRD, err := k8s_utils.GetUnstructured(crd.GetClassifierReportCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get ClassifierReport CRD unstructured: %v",
err))
logger.V(logs.LogInfo).Error(err, "failed to get ClassifierReport CRD unstructured")
return err
}

Expand All @@ -1267,7 +1265,7 @@ func deployHealthCheckCRD(ctx context.Context, clusterNamespace, clusterName, cl

healthCheckCRD, err := k8s_utils.GetUnstructured(crd.GetHealthCheckCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get HealthCheck CRD unstructured: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get HealthCheck CRD unstructured")
return err
}

Expand All @@ -1284,8 +1282,7 @@ func deployHealthCheckReportCRD(ctx context.Context, clusterNamespace, clusterNa

healthCheckReportCRD, err := k8s_utils.GetUnstructured(crd.GetHealthCheckReportCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get healthCheckReport CRD unstructured: %v",
err))
logger.V(logs.LogInfo).Error(err, "failed to get healthCheckReport CRD unstructured")
return err
}

Expand All @@ -1302,7 +1299,7 @@ func deployEventSourceCRD(ctx context.Context, clusterNamespace, clusterName, cl

eventSourceCRD, err := k8s_utils.GetUnstructured(crd.GetEventSourceCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get eventSourceCRD CRD unstructured: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get eventSourceCRD CRD unstructured")
return err
}

Expand All @@ -1319,8 +1316,7 @@ func deployEventReportCRD(ctx context.Context, clusterNamespace, clusterName, cl

eventReportCRD, err := k8s_utils.GetUnstructured(crd.GetEventReportCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get eventReportCRD CRD unstructured: %v",
err))
logger.V(logs.LogInfo).Error(err, "failed to get eventReportCRD CRD unstructured")
return err
}

Expand Down Expand Up @@ -1392,8 +1388,7 @@ func deployDebuggingConfigurationCRD(ctx context.Context, clusterNamespace, clus

dcCRD, err := k8s_utils.GetUnstructured(crd.GetDebuggingConfigurationCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get DebuggingConfiguration CRD unstructured: %v",
err))
logger.V(logs.LogInfo).Error(err, "failed to get DebuggingConfiguration CRD unstructured")
return err
}

Expand All @@ -1410,7 +1405,7 @@ func deployReloaderCRD(ctx context.Context, clusterNamespace, clusterName, class
// Deploy Reloader CRD
reloaderCRD, err := k8s_utils.GetUnstructured(crd.GetReloaderCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get Reloader CRD unstructured: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get Reloader CRD unstructured")
return err
}

Expand All @@ -1427,8 +1422,7 @@ func deployReloaderReportCRD(ctx context.Context, clusterNamespace, clusterName,
// Deploy Reloader CRD
reloaderReportCRD, err := k8s_utils.GetUnstructured(crd.GetReloaderReportCRDYAML())
if err != nil {
logger.V(logs.LogInfo).Info(
fmt.Sprintf("failed to get ReloaderReport CRD unstructured: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get ReloaderReport CRD unstructured")
return err
}

Expand Down Expand Up @@ -1599,8 +1593,7 @@ func deploySveltosAgentInManagementCluster(ctx context.Context, restConfig *rest
lbls := getSveltosAgentLabels(clusterNamespace, clusterName, clusterType)
name, err := getSveltosAgentDeploymentName(ctx, restConfig, clusterNamespace, clusterName, clusterType, lbls)
if err != nil {
logger.V(logs.LogInfo).Info(
fmt.Sprintf("failed to get name for sveltos-agent deployment: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get name for sveltos-agent deployment")
return err
}

Expand All @@ -1624,7 +1617,7 @@ func deploySveltosAgentResources(ctx context.Context, clusterNamespace, clusterN
for i := range elements {
policy, err := k8s_utils.GetUnstructured([]byte(elements[i]))
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to parse sveltos agent yaml: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to parse sveltos agent yaml")
return err
}

Expand All @@ -1642,7 +1635,7 @@ func deploySveltosAgentResources(ctx context.Context, clusterNamespace, clusterN
if policy.GetKind() == "Deployment" {
policy, err = addTemplateSpecLabels(policy, lbls)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to set deployment spec.template.labels: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to set deployment spec.template.labels")
return err
}
}
Expand All @@ -1656,7 +1649,7 @@ func deploySveltosAgentResources(ctx context.Context, clusterNamespace, clusterN
[]*unstructured.Unstructured{policy},
)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to patch sveltos-agent: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to patch sveltos-agent")
return err
}
} else {
Expand Down Expand Up @@ -1699,7 +1692,7 @@ func deploySveltosApplierResources(ctx context.Context, clusterNamespace, cluste
for i := range elements {
policy, err := k8s_utils.GetUnstructured([]byte(elements[i]))
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to parse sveltos applier yaml: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to parse sveltos applier yaml")
return err
}

Expand All @@ -1711,7 +1704,7 @@ func deploySveltosApplierResources(ctx context.Context, clusterNamespace, cluste
[]*unstructured.Unstructured{policy},
)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to patch sveltos-applier: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to patch sveltos-applier")
return err
}
} else {
Expand All @@ -1732,7 +1725,7 @@ func deploySveltosAgentPatchedResources(ctx context.Context, restConfig *rest.Co
policy := referencedUnstructured[i]
dr, err := k8s_utils.GetDynamicResourceInterface(restConfig, policy.GroupVersionKind(), policy.GetNamespace())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get dynamic client: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get dynamic client")
return err
}

Expand Down Expand Up @@ -1850,8 +1843,8 @@ func removeSveltosAgentFromManagementCluster(ctx context.Context,
name, err := getSveltosAgentDeploymentName(ctx, getManagementClusterConfig(),
clusterNamespace, clusterName, clusterType, lbls)
if err != nil {
logger.V(logs.LogInfo).Info(
fmt.Sprintf("failed to get name for sveltos-agent deployment name: %v", err))
logger.V(logs.LogInfo).Error(err,
"failed to get name for sveltos-agent deployment name")
return err
}

Expand All @@ -1864,13 +1857,13 @@ func removeSveltosAgentFromManagementCluster(ctx context.Context,
for i := range elements {
policy, err := k8s_utils.GetUnstructured([]byte(elements[i]))
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to parse sveltos-agent yaml: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to parse sveltos-agent yaml")
return err
}

dr, err := k8s_utils.GetDynamicResourceInterface(restConfig, policy.GroupVersionKind(), policy.GetNamespace())
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get dynamic client: %v", err))
logger.V(logs.LogInfo).Error(err, "failed to get dynamic client")
return err
}

Expand Down
Loading