Merge pull request Azure#3 from Azure/master

Sync with the official repo
zmssp · Jan 13, 2020 · eb5faf3 · eb5faf3
2 parents 46cfb9c + 6fca5f7
commit eb5faf3
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 7 deletions.
diff --git a/src/aks-preview/HISTORY.md b/src/aks-preview/HISTORY.md
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+0.4.27
++++++
+* Fixed aks cluster creation error
+
 0.4.26
 +++++
 * Update to use 2020-01-01 api-version

diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py
@@ -643,7 +643,7 @@ def aks_create(cmd,     # pylint: disable=too-many-locals,too-many-statements,to
                kubernetes_version='',
                node_vm_size="Standard_DS2_v2",
                node_osdisk_size=0,
-               node_osdisk_diskencryptionset_id='',
+               node_osdisk_diskencryptionset_id=None,
                node_count=3,
                nodepool_name="nodepool1",
                service_principal=None, client_secret=None,

diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py
@@ -8,7 +8,7 @@
 from codecs import open as open1
 from setuptools import setup, find_packages
 
-VERSION = "0.4.25"
+VERSION = "0.4.27"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',

diff --git a/src/index.json b/src/index.json
@@ -48,8 +48,8 @@
         ],
         "aks-preview": [
             {
-                "downloadUrl": "https://azurecliaks.blob.core.windows.net/azure-cli-extension/aks_preview-0.4.26-py2.py3-none-any.whl",
-                "filename": "aks_preview-0.4.26-py2.py3-none-any.whl",
+                "downloadUrl": "https://azurecliaks.blob.core.windows.net/azure-cli-extension/aks_preview-0.4.27-py2.py3-none-any.whl",
+                "filename": "aks_preview-0.4.27-py2.py3-none-any.whl",
                 "metadata": {
                     "azext.isPreview": true,
                     "azext.minCliCoreVersion": "2.0.49",
@@ -88,9 +88,9 @@
                     "metadata_version": "2.0",
                     "name": "aks-preview",
                     "summary": "Provides a preview for upcoming AKS features",
-                    "version": "0.4.26"
+                    "version": "0.4.27"
                 },
-                "sha256Digest": "572dfc10ff045b00a0e65528afd415b14dfaade3b8d51054b7fc45c13e81f61c"
+                "sha256Digest": "bb392f42695cbdf63fe1f9501ca6b67e4b3070b4ad285c797c1deccbb626493f"
             }
         ],
         "alias": [
@@ -2219,6 +2219,39 @@
                     "version": "0.1.0"
                 },
                 "sha256Digest": "1042caa1c3b6c85c2e5360bf57de4d26f71afd80ecae6b14cf45fbfe73b5cf0e"
+            },
+            {
+                "downloadUrl": "https://azurecliprod.blob.core.windows.net/cli-extensions/spring_cloud-0.1.1-py2.py3-none-any.whl",
+                "filename": "spring_cloud-0.1.1-py2.py3-none-any.whl",
+                "metadata": {
+                    "azext.isPreview": true,
+                    "azext.maxCliCoreVersion": "2.1.0",
+                    "azext.minCliCoreVersion": "2.0.67",
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "[email protected]",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions"
+                            }
+                        }
+                    },
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "spring-cloud",
+                    "summary": "Microsoft Azure Command-Line Tools spring-cloud Extension",
+                    "version": "0.1.1"
+                },
+                "sha256Digest": "f42d8c99ace9b4df29eea79ac7a588b1fcaecd381b1a80c7dbdd920756f8d209"
             }
         ],
         "storage-preview": [

diff --git a/src/spring-cloud/setup.py b/src/spring-cloud/setup.py
@@ -16,7 +16,7 @@
 
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '0.1.0'
+VERSION = '0.1.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers