add quotaEnabled and defaultQuota env (#4822)

labring · Jun 28, 2024 · 89ada63 · 89ada63
1 parent 5849c0a
commit 89ada63
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/controllers/objectstorage/controllers/objectstorageuser_controller.go b/controllers/objectstorage/controllers/objectstorageuser_controller.go
@@ -55,6 +55,8 @@ type ObjectStorageUserReconciler struct {
 	InternalEndpoint  string
 	ExternalEndpoint  string
 	OSUDetectionCycle time.Duration
+	QuotaEnabled      bool
+	DefaultQuota      int64
 }
 
 const (
@@ -200,7 +202,7 @@ func (r *ObjectStorageUserReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	r.Logger.V(1).Info("[user] user info", "name", user.Name, "quota", user.Status.Quota, "size", size, "objectsCount", user.Status.ObjectsCount)
 
-	if size > user.Status.Quota {
+	if r.QuotaEnabled && size > user.Status.Quota {
 		if err := r.addUserToGroup(ctx, accessKey, UserDenyWriteGroup); err != nil {
 			r.Logger.Error(err, "failed to add user to userDenyWrite group")
 			return ctrl.Result{}, err
@@ -338,9 +340,8 @@ func (r *ObjectStorageUserReconciler) deleteObjectStorageUser(ctx context.Contex
 func (r *ObjectStorageUserReconciler) initObjectStorageUser(user *objectstoragev1.ObjectStorageUser, username string) bool {
 	var updated = false
 
-	if user.Status.Quota == 0 {
-		// 1073741824Byte = 1G
-		user.Status.Quota = 1073741824
+	if user.Status.Quota != r.DefaultQuota {
+		user.Status.Quota = r.DefaultQuota
 		updated = true
 	}
 
@@ -417,6 +418,12 @@ func (r *ObjectStorageUserReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return fmt.Errorf("failed to get the endpoint or namespace or admin secret env of object storage")
 	}
 
+	quotaEnabled := env.GetBoolWithDefault("quotaEnabled", true)
+	r.QuotaEnabled = quotaEnabled
+
+	defaultQuota := env.GetInt64EnvWithDefault("defaultQuota", 107374182400)
+	r.DefaultQuota = defaultQuota
+
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&objectstoragev1.ObjectStorageUser{}).
 		Complete(r)