Simplify quota system: remove config-based unlimited options

- Remove adminsUnlimited, unlimitedUsers, defaultUnlimited config options
- Unlimited quota now managed exclusively via Admin UI
- Auto-login mode still disables quota system entirely
- Update documentation and values.yaml

Author: MioYuuIH

docs/jupyterhub/quota-system.md

@@ -30,18 +30,11 @@ custom:
     cpuRate: 1                 # Cost per minute for CPU-only containers
     minimumToStart: 10         # Minimum quota required to start any container
     defaultQuota: 0            # Default quota granted to new users (0 = no initial allocation)
-    defaultUnlimited: false    # Grant unlimited quota to new users (overrides defaultQuota)
-    adminsUnlimited: true      # Admin users have unlimited quota
-    unlimitedUsers: []         # List of usernames with unlimited quota
 ```
 
 ### New User Default Quota
 
-Two settings control quota allocation for new users:
-
-#### defaultQuota
-
-Controls how much quota new users receive automatically:
+The `defaultQuota` setting controls how much quota new users receive automatically:
 
 - **Value `0` (default)**: New users start with zero quota and must be manually granted quota by an administrator
 - **Value `> 0`**: New users are automatically granted this amount when they first attempt to use the system
@@ -53,35 +46,20 @@ custom:
     defaultQuota: 100  # Automatically grant 100 quota units to new users
 ```
 
-#### defaultUnlimited
-
-Grant unlimited quota to all new users:
-
-- **Value `false` (default)**: New users receive quota based on `defaultQuota` setting
-- **Value `true`**: New users are automatically granted unlimited quota (overrides `defaultQuota`)
-
-**Example configuration:**
-```yaml
-custom:
-  quota:
-    defaultUnlimited: true  # All new users get unlimited quota
-```
-
 #### How It Works
 
 This automatic allocation happens when a new user first tries to start a container. The system will:
 1. Check if the user has a quota record in the database
-2. If not found:
-   - If `defaultUnlimited: true`, create a record with unlimited quota status
-   - Else if `defaultQuota > 0`, create a record with the default amount
-   - Otherwise, create a record with zero quota
+2. If not found and `defaultQuota > 0`, create a record with the default amount
 3. Record this as an "initial_grant" transaction in the audit log
 
-**Priority order:**
-1. Admin users (if `adminsUnlimited: true`)
-2. Users in `unlimitedUsers` list
-3. New users with `defaultUnlimited: true`
-4. New users with `defaultQuota` value
+### Unlimited Quota
+
+Unlimited quota status is managed via the Admin UI. To grant unlimited quota to a user:
+1. Go to the Admin Panel (`/hub/admin/users`)
+2. Click on the user's quota value
+3. Enter `-1`, `∞`, or `unlimited` in the input field
+4. Click Save
 
 ### Quota Rates by Resource Type
 
@@ -585,11 +563,7 @@ Sessions stuck for more than 8 hours are automatically cleaned up on hub startup
 
 ### Unlimited Quota Logic
 
-A user has unlimited quota if ANY of these conditions are true:
-
-1. User is admin AND `adminsUnlimited: true` in config
-2. Username is in `unlimitedUsers` config list (case-insensitive)
-3. User is marked `unlimited: true` in database
+A user has unlimited quota if marked `unlimited: true` in the database.
 
 ## Troubleshooting
 
@@ -608,20 +582,14 @@ A user has unlimited quota if ANY of these conditions are true:
    python scripts/manage_users.py add-quota username --amount 500
    ```
 
-3. Or grant unlimited quota via API:
-   ```bash
-   curl -X POST "$JUPYTERHUB_URL/admin/api/quota/username" \
-     -H "Authorization: token $JUPYTERHUB_TOKEN" \
-     -H "Content-Type: application/json" \
-     -d '{"action": "set_unlimited", "unlimited": true}'
-   ```
+3. Or grant unlimited quota via Admin UI (click quota value and enter `∞`)
 
 ### Quota Not Being Deducted
 
 **Symptom:** User's balance doesn't decrease after container use
 
 **Possible causes:**
-1. User has unlimited quota (admin, in unlimitedUsers list, or marked unlimited)
+1. User has unlimited quota (set via Admin UI)
 2. Quota system is disabled (`custom.quota.enabled: false`)
 3. Session ended abnormally (cleaned up as stale)
 

runtime/jupyterhub/files/hub/jupyterhub_config.py

@@ -262,27 +262,14 @@ def get_quota_rate(accelerator_type: str | None) -> int:
 # Config: custom.quota.minimumToStart (int)
 MINIMUM_QUOTA_TO_START = int(z2jh_get_config("custom.quota.minimumToStart", 10))
 
-# Default quota for new users
+# Default quota for new users (0 = no quota granted, must be set by admin)
 # Config: custom.quota.defaultQuota (int)
 DEFAULT_QUOTA = int(z2jh_get_config("custom.quota.defaultQuota", 0))
 
-# Grant unlimited quota to new users by default
-# Config: custom.quota.defaultUnlimited (bool)
-DEFAULT_UNLIMITED = bool(z2jh_get_config("custom.quota.defaultUnlimited", False))
-
-# Admin users have unlimited quota (no quota deduction)
-# Config: custom.quota.adminsUnlimited (bool)
-QUOTA_ADMINS_UNLIMITED = bool(z2jh_get_config("custom.quota.adminsUnlimited", True))
-
-# List of usernames with unlimited quota (case-insensitive)
-# Config: custom.quota.unlimitedUsers (list)
-QUOTA_UNLIMITED_USERS: list[str] = z2jh_get_config_list("custom.quota.unlimitedUsers", [])
-
 if QUOTA_ENABLED:
     print(f"[CONFIG] Quota rates by accelerator: {QUOTA_RATES}")
     print(f"[CONFIG] Quota minimum to start: {MINIMUM_QUOTA_TO_START}")
-    print(f"[CONFIG] Quota default for new users: {DEFAULT_QUOTA}" + (" (unlimited)" if DEFAULT_UNLIMITED else ""))
-    print(f"[CONFIG] Quota admins unlimited: {QUOTA_ADMINS_UNLIMITED}, unlimited users: {QUOTA_UNLIMITED_USERS}")
+    print(f"[CONFIG] Quota default for new users: {DEFAULT_QUOTA}")
 
 LOCAL_ACCOUNT_PREFIX = "LocalAccount"
 LOCAL_ACCOUNT_PREFIX_UPPER = LOCAL_ACCOUNT_PREFIX.upper()
@@ -1028,14 +1015,11 @@ async def get(self):
         from quota_manager import get_quota_manager
 
         username = self.current_user.name
-        is_admin = getattr(self.current_user, "admin", False)
         quota_manager = get_quota_manager()
         balance = quota_manager.get_balance(username)
 
         # Check if user has unlimited quota
-        has_unlimited = quota_manager.has_unlimited_quota(
-            username, is_admin, QUOTA_ADMINS_UNLIMITED, QUOTA_UNLIMITED_USERS
-        )
+        has_unlimited = quota_manager.is_unlimited_in_db(username)
 
         self.set_header("Content-Type", "application/json")
         self.finish(
@@ -1617,12 +1601,9 @@ async def start(self):
             from quota_manager import get_quota_manager
 
             quota_manager = get_quota_manager()
-            is_admin = getattr(self.user, "admin", False)
 
             # Check if user has unlimited quota
-            has_unlimited = quota_manager.has_unlimited_quota(
-                username, is_admin, QUOTA_ADMINS_UNLIMITED, QUOTA_UNLIMITED_USERS
-            )
+            has_unlimited = quota_manager.is_unlimited_in_db(username)
 
             if has_unlimited:
                 print(f"[QUOTA] User {username} has unlimited quota, skipping quota check")
@@ -1634,11 +1615,7 @@ async def start(self):
                     accelerator_type,
                     runtime_minutes,
                     QUOTA_RATES,
-                    is_admin,
-                    QUOTA_ADMINS_UNLIMITED,
-                    QUOTA_UNLIMITED_USERS,
                     DEFAULT_QUOTA,
-                    DEFAULT_UNLIMITED,
                 )
 
                 if not can_start:

runtime/jupyterhub/files/hub/quota_manager.py

@@ -128,45 +128,22 @@ def get_balance(self, username: str) -> int:
             row = cursor.fetchone()
             return row["balance"] if row else 0
 
-    def ensure_user_quota(self, username: str, default_quota: int = 0, default_unlimited: bool = False) -> int:
+    def ensure_user_quota(self, username: str, default_quota: int = 0) -> int:
         """
-        Ensure user has a quota record. If user doesn't exist:
-        - If default_unlimited=True, grant unlimited quota
-        - Else if default_quota > 0, grant the default quota amount
-        Returns the user's current balance.
+        Ensure user has a quota record. If user doesn't exist and default_quota > 0,
+        grant the default quota amount. Returns the user's current balance.
         """
         username = username.lower()
         with self._lock, self._get_connection() as conn:
             cursor = conn.cursor()
-            cursor.execute("SELECT balance, unlimited FROM user_quota WHERE username = ?", (username,))
+            cursor.execute("SELECT balance FROM user_quota WHERE username = ?", (username,))
             row = cursor.fetchone()
 
             if row:
                 # User already exists
                 return row["balance"]
 
-            # New user - check if we should grant unlimited quota
-            if default_unlimited:
-                cursor.execute(
-                    """
-                    INSERT INTO user_quota (username, balance, unlimited)
-                    VALUES (?, 0, 1)
-                """,
-                    (username,),
-                )
-                cursor.execute(
-                    """
-                    INSERT INTO quota_transactions
-                    (username, amount, transaction_type, balance_before, balance_after, description)
-                    VALUES (?, 0, 'initial_grant', 0, 0, 'Initial grant: unlimited quota')
-                """,
-                    (username,),
-                )
-                conn.commit()
-                print(f"[QUOTA] New user '{username}' granted unlimited quota")
-                return 0
-
-            # New user - check if we should grant default quota
+            # New user - grant default quota if configured
             if default_quota > 0:
                 cursor.execute(
                     """
@@ -349,28 +326,11 @@ def set_unlimited(self, username: str, unlimited: bool, admin: str | None = None
             conn.commit()
             return unlimited
 
-    def has_unlimited_quota(
-        self,
-        username: str,
-        is_admin: bool = False,
-        admins_unlimited: bool = True,
-        unlimited_users: list[str] | None = None,
-    ) -> bool:
+    def has_unlimited_quota(self, username: str) -> bool:
         """
         Check if user has unlimited quota.
-        Returns True if:
-        - User is admin and admins_unlimited is True
-        - User is in the unlimited_users config list
-        - User is marked as unlimited in the database
+        Only checks the database - unlimited status is managed via admin UI.
         """
-        username = username.lower()
-        # Check config: admin unlimited
-        if is_admin and admins_unlimited:
-            return True
-        # Check config: unlimited users list
-        if unlimited_users and username in [u.lower() for u in unlimited_users]:
-            return True
-        # Check database
         return self.is_unlimited_in_db(username)
 
     def can_start_container(
@@ -379,11 +339,7 @@ def can_start_container(
         resource_type: str,
         duration_minutes: int,
         quota_rates: dict,
-        is_admin: bool = False,
-        admins_unlimited: bool = True,
-        unlimited_users: list[str] | None = None,
         default_quota: int = 0,
-        default_unlimited: bool = False,
     ) -> tuple[bool, str, int]:
         """
         Check if user has sufficient quota to start a container.
@@ -394,11 +350,10 @@ def can_start_container(
         estimated_cost = rate * duration_minutes
 
         # Ensure user has a quota record (grant default if new user)
-        # Must be called BEFORE has_unlimited_quota check to create DB record for new users
-        balance = self.ensure_user_quota(username, default_quota, default_unlimited)
+        balance = self.ensure_user_quota(username, default_quota)
 
-        # Check for unlimited quota (includes newly granted unlimited users)
-        if self.has_unlimited_quota(username, is_admin, admins_unlimited, unlimited_users):
+        # Check for unlimited quota
+        if self.has_unlimited_quota(username):
             return True, "Unlimited quota", 0
 
         if balance < estimated_cost:

runtime/values.yaml

@@ -96,25 +96,11 @@ custom:
     # Minimum quota required to start any container
     minimumToStart: 10
 
-    # Default quota for new users
+    # Default quota for new users (0 = no initial allocation, must be set by admin)
     # When a new user first attempts to use the system, they will be automatically
-    # granted this amount of quota if they don't have unlimited status
+    # granted this amount of quota
     defaultQuota: 0
 
-    # Grant unlimited quota to new users by default
-    # If true, new users will have unlimited quota (overrides defaultQuota)
-    defaultUnlimited: false
-
-    # Admin users have unlimited quota (no quota deduction)
-    adminsUnlimited: true
-
-    # List of usernames with unlimited quota (case-insensitive)
-    unlimitedUsers: []
-    # Example:
-    # unlimitedUsers:
-    #   - instructor1
-    #   - researcher1
-
     # Auto-refresh rules: each rule generates a K8s CronJob
     #
     # Action modes: