Merge branch 'Azure:main' into main

Tejaswikandula · Jul 18, 2024 · fe38e59 · fe38e59
2 parents 83dc1ff + 085f640
commit fe38e59
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 19 deletions.
diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst
@@ -11,10 +11,15 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+* Update the minimum required cli core version to `2.61.0`.
+
+7.0.0b1
+++++++++
+* [BREAKING CHANGE]: Remove support for `az aks get-os-options` command.
 
 6.0.0b1
 ++++++++
-* Remove support for `az aks mesh` egress gateway commands.
+* [BREAKING CHANGE]: Remove support for `az aks mesh` egress gateway commands.
 * Add validation to `az aks create` and `az aks update` while modifying the `--ephemeral-disk-volume-type` and `--ephemeral-disk-nvme-perf-tier` values.
 
 5.0.0b4

diff --git a/src/aks-preview/README.rst b/src/aks-preview/README.rst
@@ -43,8 +43,10 @@ Dependency between aks-preview and azure-cli/acs (azure-cli-core)
       - >= `\2.44.0 <https://github.com/Azure/azure-cli/releases/tag/azure-cli-2.44.0>`_, 2023/01/10
     * - 0.5.152 ~ 2.0.0b6
       - >= `\2.49.0 <https://github.com/Azure/azure-cli/releases/tag/azure-cli-2.49.0>`_, 2023/05/23
-    * - 2.0.0b7 ~ latest
+    * - 2.0.0b7 ~ 7.0.0b1
       - >= `\2.56.0 <https://github.com/Azure/azure-cli/releases/tag/azure-cli-2.56.0>`_, 2024/01/09
+    * - 7.0.0b2 ~ latest
+      - >= `\2.61.0 <https://github.com/Azure/azure-cli/releases/tag/azure-cli-2.61.0>`_, 2024/05/21
 
 Released version and adopted API version
 ========================================

diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py
@@ -2519,15 +2519,6 @@
     crafted: true
 """
 
-helps['aks get-os-options'] = """
-type: command
-short-summary: Get the OS options available for creating a managed Kubernetes cluster.
-examples:
-  - name: Get the OS options available for creating a managed Kubernetes cluster
-    text: az aks get-os-options --location westus2
-    crafted: true
-"""
-
 helps['aks get-credentials'] = """
 type: command
 short-summary: Get access credentials for a managed Kubernetes cluster.

diff --git a/src/aks-preview/azext_aks_preview/azext_metadata.json b/src/aks-preview/azext_aks_preview/azext_metadata.json
@@ -1,5 +1,5 @@
 {
-    "azext.minCliCoreVersion": "2.56.0",
+    "azext.minCliCoreVersion": "2.61.0",
     "azext.isPreview": true,
     "name": "aks-preview"
 }
diff --git a/src/aks-preview/azext_aks_preview/commands.py b/src/aks-preview/azext_aks_preview/commands.py
@@ -180,7 +180,6 @@ def load_command_table(self, _):
         # aks-preview only
         g.custom_command("kollect", "aks_kollect")
         g.custom_command("kanalyze", "aks_kanalyze")
-        g.custom_command("get-os-options", "aks_get_os_options")
         g.custom_command(
             "operation-abort", "aks_operation_abort", supports_no_wait=True
         )

diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py
@@ -1818,7 +1818,7 @@ def aks_agentpool_manual_scale_update(cmd,    # pylint: disable=unused-argument
             break
     if not manual_exists:
         raise InvalidArgumentValueError(
-            f"Manual with sizes {','.join(current_vm_sizes)} doesn't exist in node pool {nodepool_name}"
+            f"Manual with sizes {current_vm_sizes} doesn't exist in node pool {nodepool_name}"
         )
 
     return sdk_no_wait(
@@ -2524,10 +2524,6 @@ def aks_get_versions(cmd, client, location):    # pylint: disable=unused-argumen
     return client.list_kubernetes_versions(location)
 
 
-def aks_get_os_options(cmd, client, location):    # pylint: disable=unused-argument
-    return client.get_os_options(location, resource_type='managedClusters')
-
-
 def get_aks_custom_headers(aks_custom_headers=None):
     headers = {}
     if aks_custom_headers is not None:

diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py
@@ -9,7 +9,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "6.0.0b1"
+VERSION = "7.0.0b1"
 
 CLASSIFIERS = [
     "Development Status :: 4 - Beta",

diff --git a/src/index.json b/src/index.json
@@ -11374,6 +11374,49 @@
                     "version": "6.0.0b1"
                 },
                 "sha256Digest": "2e04cfef1cb404760006d73786c57259f8e5c92bc42b9eaca7314301ce0ba1a4"
+            },
+            {
+                "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-7.0.0b1-py2.py3-none-any.whl",
+                "filename": "aks_preview-7.0.0b1-py2.py3-none-any.whl",
+                "metadata": {
+                    "azext.isPreview": true,
+                    "azext.minCliCoreVersion": "2.56.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.6",
+                        "Programming Language :: Python :: 3.7",
+                        "Programming Language :: Python :: 3.8",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "azpycli@microsoft.com",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/aks-preview"
+                            }
+                        }
+                    },
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "aks-preview",
+                    "summary": "Provides a preview for upcoming AKS features",
+                    "version": "7.0.0b1"
+                },
+                "sha256Digest": "202443c5f559b7b57362479118a836d54d7eb2194d56e5eb31a15bea3bf35811"
             }
         ],
         "aksarc": [