Merge branch 'master' into pre-commit-ci-update-config

neuro-inc · Dec 5, 2024 · ed95a3f · ed95a3f
2 parents f9dd9a2 + 2c4568f
commit ed95a3f
Show file tree

Hide file tree

Showing 22 changed files with 515 additions and 289 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -65,7 +65,7 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         continue-on-error: [false]
         cmd: [sdk, cli]
         # temporarily disable windows tests
@@ -77,6 +77,9 @@ jobs:
         - python-version: '3.11'
           os: macos
           continue-on-error: false
+        - python-version: '3.12'
+          os: macos
+          continue-on-error: false
         # os: [ubuntu, macos, windows]
         # exclude:
         # - python-version: '3.10'
@@ -87,15 +90,15 @@ jobs:
         #   os: macos
         # - python-version: '3.11'
         #   os: windows
-        include:
-        - python-version: '3.13'
-          os: ubuntu
-          cmd: sdk
-          continue-on-error: true
-        - python-version: '3.13'
-          os: ubuntu
-          cmd: cli
-          continue-on-error: true
+        # include:
+        # - python-version: '3.14'
+        #   os: ubuntu
+        #   cmd: sdk
+        #   continue-on-error: true
+        # - python-version: '3.14'
+        #   os: ubuntu
+        #   cmd: cli
+        #   continue-on-error: true
       fail-fast: false
     runs-on: ${{ matrix.os }}-latest
     timeout-minutes: 15
@@ -141,7 +144,7 @@ jobs:
       (github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]')
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         os: [ubuntu, macos, windows]
         exclude:
         - python-version: '3.10'
@@ -152,6 +155,10 @@ jobs:
           os: macos
         - python-version: '3.11'
           os: windows
+        - python-version: '3.12'
+          os: macos
+        - python-version: '3.12'
+          os: windows
       fail-fast: false
     runs-on: ${{ matrix.os }}-latest
     timeout-minutes: 90

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,24 @@
 
 [comment]: # (towncrier release notes start)
 
+# Apolo SDK/CLI 24.12.0 (2024-12-05)
+
+### Features
+
+- Balance is no longer stored on a cluster level, and was moved to an organization level, e.g.,
+  to an org itself, and to an org users, instead of a cluster / cluster users.
+
+  New commands:
+    - `apolo admin set-org-defaults` - allows to set an organization default values, such as a default user credits
+
+  Existing commands changes:
+    - `apolo admin add-cluster-user` cmd is no longer accepting a `credits` argument.
+    - `apolo admin set-user-credits` cmd is now expecting an org name instead of a cluster name.
+    - `apolo admin add-user-credits` cmd is now expecting an org name instead of a cluster name.
+    - `apolo admin set-org-cluster-credits` was removed in a favor of an `apolo admin set-org-credits`.
+    - `apolo admin add-org-cluster-credits` was removed in a favor of an `apolo admin add-org-credits`. ([#3137](https://github.com/neuro-inc/neuro-cli/issues/3137))
+
+
 # Apolo SDK/CLI 24.11.4 (2024-11-22)
 
 No significant changes.

diff --git a/CLI.md b/CLI.md
@@ -14,7 +14,7 @@
 		* [apolo admin add-cluster-user](#apolo-admin-add-cluster-user)
 		* [apolo admin add-org](#apolo-admin-add-org)
 		* [apolo admin add-org-cluster](#apolo-admin-add-org-cluster)
-		* [apolo admin add-org-cluster-credits](#apolo-admin-add-org-cluster-credits)
+		* [apolo admin add-org-credits](#apolo-admin-add-org-credits)
 		* [apolo admin add-org-user](#apolo-admin-add-org-user)
 		* [apolo admin add-project](#apolo-admin-add-project)
 		* [apolo admin add-project-user](#apolo-admin-add-project-user)
@@ -38,9 +38,10 @@
 		* [apolo admin remove-project](#apolo-admin-remove-project)
 		* [apolo admin remove-project-user](#apolo-admin-remove-project-user)
 		* [apolo admin remove-resource-preset](#apolo-admin-remove-resource-preset)
-		* [apolo admin set-org-cluster-credits](#apolo-admin-set-org-cluster-credits)
 		* [apolo admin set-org-cluster-defaults](#apolo-admin-set-org-cluster-defaults)
 		* [apolo admin set-org-cluster-quota](#apolo-admin-set-org-cluster-quota)
+		* [apolo admin set-org-credits](#apolo-admin-set-org-credits)
+		* [apolo admin set-org-defaults](#apolo-admin-set-org-defaults)
 		* [apolo admin set-user-credits](#apolo-admin-set-user-credits)
 		* [apolo admin set-user-quota](#apolo-admin-set-user-quota)
 		* [apolo admin show-cluster-options](#apolo-admin-show-cluster-options)
@@ -453,15 +454,15 @@ Name | Description|
 |Usage|Description|
 |---|---|
 | _[apolo admin add-cluster](#apolo-admin-add-cluster)_| Create a new cluster |
-| _[apolo admin add\-cluster-user](#apolo-admin-add-cluster-user)_| Add user access to specified cluster |
+| _[apolo admin add\-cluster-user](#apolo-admin-add-cluster-user)_| Add user access to a specified cluster |
 | _[apolo admin add-org](#apolo-admin-add-org)_| Create a new org |
 | _[apolo admin add\-org-cluster](#apolo-admin-add-org-cluster)_| Add org access to specified cluster |
-| _[apolo admin add\-org-cluster-credits](#apolo-admin-add-org-cluster-credits)_| Add given values to org cluster balance |
+| _[apolo admin add\-org-credits](#apolo-admin-add-org-credits)_| Add given values to org balance |
 | _[apolo admin add\-org-user](#apolo-admin-add-org-user)_| Add user access to specified org |
 | _[apolo admin add-project](#apolo-admin-add-project)_| Add new project to specified cluster |
 | _[apolo admin add\-project-user](#apolo-admin-add-project-user)_| Add user access to specified project |
 | _[apolo admin add\-resource-preset](#apolo-admin-add-resource-preset)_| Add new resource preset |
-| _[apolo admin add\-user-credits](#apolo-admin-add-user-credits)_| Add given values to user quota |
+| _[apolo admin add\-user-credits](#apolo-admin-add-user-credits)_| Add given values to user credits |
 | _[apolo admin generate\-cluster-config](#apolo-admin-generate-cluster-config)_| Create a cluster configuration file |
 | _[apolo admin get\-cluster-orgs](#apolo-admin-get-cluster-orgs)_| Print the list of all orgs in the cluster |
 | _[apolo admin get\-cluster-users](#apolo-admin-get-cluster-users)_| List users in specified cluster |
@@ -480,9 +481,10 @@ Name | Description|
 | _[apolo admin remove-project](#apolo-admin-remove-project)_| Drop a project |
 | _[apolo admin remove\-project-user](#apolo-admin-remove-project-user)_| Remove user access from the project |
 | _[apolo admin remove\-resource-preset](#apolo-admin-remove-resource-preset)_| Remove resource preset |
-| _[apolo admin set\-org-cluster-credits](#apolo-admin-set-org-cluster-credits)_| Set org cluster credits to given value |
 | _[apolo admin set\-org-cluster-defaults](#apolo-admin-set-org-cluster-defaults)_| Set org cluster defaults to given value |
 | _[apolo admin set\-org-cluster-quota](#apolo-admin-set-org-cluster-quota)_| Set org cluster quota to given values |
+| _[apolo admin set\-org-credits](#apolo-admin-set-org-credits)_| Set org credits to given value |
+| _[apolo admin set\-org-defaults](#apolo-admin-set-org-defaults)_| Set org defaults to a given value |
 | _[apolo admin set\-user-credits](#apolo-admin-set-user-credits)_| Set user credits to given value |
 | _[apolo admin set\-user-quota](#apolo-admin-set-user-quota)_| Set user quota to given values |
 | _[apolo admin show\-cluster-options](#apolo-admin-show-cluster-options)_| Show available cluster options |
@@ -521,7 +523,7 @@ Name | Description|
 
 ### apolo admin add-cluster-user
 
-Add user access to specified cluster.<br/><br/>The command supports one of 3 user roles: admin, manager or user.
+Add user access to a specified cluster.<br/><br/>The command supports one of three user roles: admin, manager or user.
 
 **Usage:**
 
@@ -534,7 +536,6 @@ apolo admin add-cluster-user [OPTIONS] CLUSTER_NAME USER_NAME [ROLE]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
-|_\-c, --credits AMOUNT_|Credits amount to set \(`unlimited' stands for no limit)|
 |_\-j, --jobs AMOUNT_|Maximum running jobs quota \(`unlimited' stands for no limit)|
 |_--org ORG_|org name for org-cluster users|
 
@@ -585,14 +586,14 @@ Name | Description|
 
 
 
-### apolo admin add-org-cluster-credits
+### apolo admin add-org-credits
 
-Add given values to org cluster balance
+Add given values to org balance
 
 **Usage:**
 
 ```bash
-apolo admin add-org-cluster-credits [OPTIONS] CLUSTER_NAME ORG_NAME
+apolo admin add-org-credits [OPTIONS] ORG
 ```
 
 **Options:**
@@ -607,7 +608,7 @@ Name | Description|
 
 ### apolo admin add-org-user
 
-Add user access to specified org.<br/><br/>The command supports one of 3 user roles: admin, manager or user.
+Add user access to specified org.<br/><br/>The command supports one of three user roles: admin, manager or user.
 
 **Usage:**
 
@@ -620,6 +621,7 @@ apolo admin add-org-user [OPTIONS] ORG_NAME USER_NAME [ROLE]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
+|_\-c, --credits AMOUNT_|Credits amount to set \(`unlimited' stands for no limit)|
 
 
 
@@ -702,12 +704,12 @@ Name | Description|
 
 ### apolo admin add-user-credits
 
-Add given values to user quota
+Add given values to user credits
 
 **Usage:**
 
 ```bash
-apolo admin add-user-credits [OPTIONS] CLUSTER_NAME USER_NAME
+apolo admin add-user-credits [OPTIONS] ORG USER_NAME
 ```
 
 **Options:**
@@ -716,7 +718,6 @@ Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
 |_\-c, --credits AMOUNT_|Credits amount to add  \[required]|
-|_--org ORG_|org name for org-cluster users|
 
 
 
@@ -1077,64 +1078,84 @@ Name | Description|
 
 
 
-### apolo admin set-org-cluster-credits
+### apolo admin set-org-cluster-defaults
 
-Set org cluster credits to given value
+Set org cluster defaults to given value
 
 **Usage:**
 
 ```bash
-apolo admin set-org-cluster-credits [OPTIONS] CLUSTER_NAME ORG_NAME
+apolo admin set-org-cluster-defaults [OPTIONS] CLUSTER_NAME ORG_NAME
 ```
 
 **Options:**
 
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
-|_\-c, --credits AMOUNT_|Credits amount to set \(`unlimited' stands for no limit)  \[required]|
+|_\--default-credits AMOUNT_|Default credits amount to set \(`unlimited' stands for no limit)  \[default: unlimited]|
+|_\--default-jobs AMOUNT_|Default maximum running jobs quota \(`unlimited' stands for no limit)  \[default: unlimited]|
+|_\--default-role \[ROLE]_|Default role for new users added to org cluster  \[default: user]|
 
 
 
 
-### apolo admin set-org-cluster-defaults
+### apolo admin set-org-cluster-quota
 
-Set org cluster defaults to given value
+Set org cluster quota to given values
 
 **Usage:**
 
 ```bash
-apolo admin set-org-cluster-defaults [OPTIONS] CLUSTER_NAME ORG_NAME
+apolo admin set-org-cluster-quota [OPTIONS] CLUSTER_NAME ORG_NAME
 ```
 
 **Options:**
 
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
-|_\--default-credits AMOUNT_|Default credits amount to set \(`unlimited' stands for no limit)  \[default: unlimited]|
-|_\--default-jobs AMOUNT_|Default maximum running jobs quota \(`unlimited' stands for no limit)  \[default: unlimited]|
-|_\--default-role \[ROLE]_|Default role for new users added to org cluster  \[default: user]|
+|_\-j, --jobs AMOUNT_|Maximum running jobs quota \(`unlimited' stands for no limit)  \[required]|
 
 
 
 
-### apolo admin set-org-cluster-quota
+### apolo admin set-org-credits
 
-Set org cluster quota to given values
+Set org credits to given value
 
 **Usage:**
 
 ```bash
-apolo admin set-org-cluster-quota [OPTIONS] CLUSTER_NAME ORG_NAME
+apolo admin set-org-credits [OPTIONS] ORG
 ```
 
 **Options:**
 
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
-|_\-j, --jobs AMOUNT_|Maximum running jobs quota \(`unlimited' stands for no limit)  \[required]|
+|_\-c, --credits AMOUNT_|Credits amount to set \(`unlimited' stands for no limit)  \[required]|
+
+
+
+
+### apolo admin set-org-defaults
+
+Set org defaults to a given value
+
+**Usage:**
+
+```bash
+apolo admin set-org-defaults [OPTIONS] ORG_NAME
+```
+
+**Options:**
+
+Name | Description|
+|----|------------|
+|_--help_|Show this message and exit.|
+|_\--user-default-credits AMOUNT_|Default credits amount to set for org users \(`unlimited' stands for no limit)  \[default: unlimited]|
 
 
 
@@ -1146,7 +1167,7 @@ Set user credits to given value
 **Usage:**
 
 ```bash
-apolo admin set-user-credits [OPTIONS] CLUSTER_NAME USER_NAME
+apolo admin set-user-credits [OPTIONS] ORG USER_NAME
 ```
 
 **Options:**
@@ -1155,7 +1176,6 @@ Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
 |_\-c, --credits AMOUNT_|Credits amount to set \(`unlimited' stands for no limit)  \[required]|
-|_--org ORG_|org name for org-cluster users|
 
 
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1,4 +1,4 @@
 # Global version number,
 # Update the file and run 'make fmt' to apply it everywhere
 
-24.11.4
+24.12.0