github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-08-25 16:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving the Namespace count reconciliation to the Tenant reconciler (#39)

Browse Source
This commit is contained in:
Dario Tranchitella
2020-08-06 13:36:21 +02:00
committed by GitHub
parent 6d4fb83a23
commit a3c667b2b9
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/namespace_controller.go
-11
View File
@@ -112,13 +112,6 @@ func (r *NamespaceReconciler) addNamespace(name string, tenant *v1alpha1.Tenant)
tenant.Status.Namespaces = append(tenant.Status.Namespaces, c[i:]...)
}
func (r *NamespaceReconciler) updateNamespaceCount(tenant *v1alpha1.Tenant) error {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
tenant.Status.Size = uint(len(tenant.Status.Namespaces))
return r.Client.Status().Update(context.TODO(), tenant, &client.UpdateOptions{})
})
}
func (r NamespaceReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error) {
r.Log = r.Log.WithValues("Request.Name", request.Name)
r.Log.Info("Reconciling Namespace")
@@ -150,10 +143,6 @@ func (r NamespaceReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error
r.updateTenantStatus(ns, t)
if err := r.updateNamespaceCount(t); err != nil {
r.Log.Error(err, "cannot update Namespace list", "tenant", t.Name)
}
r.Log.Info("Namespace reconciliation processed")
return reconcile.Result{}, nil
}
controllers/tenant_controller.go
+13
View File
@@ -113,6 +113,12 @@ func (r TenantReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error) {
return reconcile.Result{}, err
}
r.Log.Info("Ensuring Namespace count")
if err := r.ensureNamespaceCount(instance); err != nil {
r.Log.Error(err, "Cannot sync Namespace count")
return reconcile.Result{}, err
}
r.Log.Info("Tenant reconciling completed")
return ctrl.Result{}, nil
}
@@ -546,3 +552,10 @@ func (r *TenantReconciler) ensureNodeSelector(tenant *capsulev1alpha1.Tenant) (e
return
}
func (r *TenantReconciler) ensureNamespaceCount(tenant *capsulev1alpha1.Tenant) error {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
tenant.Status.Size = uint(tenant.Status.Namespaces.Len())
return r.Client.Status().Update(context.TODO(), tenant, &client.UpdateOptions{})
})
}