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

Updating tenant after adding/removing Namespace (#43)

Browse Source
This commit is contained in:
Dario Tranchitella
2020-08-06 21:50:50 +02:00
committed by GitHub
parent 941bddb81d
commit a29db95ad3
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/namespace_controller.go
+15 -8
View File
@@ -141,7 +141,10 @@ func (r NamespaceReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error
return reconcile.Result{}, err
}
r.updateTenantStatus(ns, t)
if err := r.updateTenantStatus(ns, t); err != nil {
r.Log.Error(err, "cannot update Tenant status")
return reconcile.Result{}, err
}
r.Log.Info("Namespace reconciliation processed")
return reconcile.Result{}, nil
@@ -165,11 +168,15 @@ func (r *NamespaceReconciler) ensureLabel(ns *corev1.Namespace, tenantName strin
return nil
}
func (r *NamespaceReconciler) updateTenantStatus(ns *corev1.Namespace, tenant *v1alpha1.Tenant) {
switch ns.Status.Phase {
case corev1.NamespaceTerminating:
r.removeNamespace(ns.Name, tenant)
case corev1.NamespaceActive:
r.addNamespace(ns.Name, tenant)
}
func (r *NamespaceReconciler) updateTenantStatus(ns *corev1.Namespace, tenant *v1alpha1.Tenant) error {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
switch ns.Status.Phase {
case corev1.NamespaceTerminating:
r.removeNamespace(ns.Name, tenant)
case corev1.NamespaceActive:
r.addNamespace(ns.Name, tenant)
}
return r.Client.Status().Update(context.TODO(), tenant, &client.UpdateOptions{})
})
}