From 0d03006191ce8eee6e9bb76857c4aef4815187e6 Mon Sep 17 00:00:00 2001 From: Shichao Qiu Date: Fri, 10 Jan 2020 14:40:20 +0800 Subject: [PATCH 1/2] update index.json and the version value in the setup.py (#1190) --- src/index.json | 35 ++++++++++++++++++++++++++++++++++- src/spring-cloud/setup.py | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/index.json b/src/index.json index 3635ce67a38..6c9e78fb627 100644 --- a/src/index.json +++ b/src/index.json @@ -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": "azpycli@microsoft.com", + "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": [ @@ -2626,4 +2659,4 @@ ] }, "formatVersion": "1" -} +} \ No newline at end of file diff --git a/src/spring-cloud/setup.py b/src/spring-cloud/setup.py index 5511c14574b..8570377ae8d 100644 --- 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 From 6fca5f767ba76701fd63fc2ef3e30d7fef4ca0bb Mon Sep 17 00:00:00 2001 From: Andy Zhang Date: Mon, 13 Jan 2020 10:41:16 +0800 Subject: [PATCH 2/2] fix: aks cluster creation error (#1192) --- src/aks-preview/HISTORY.md | 4 ++++ src/aks-preview/azext_aks_preview/custom.py | 2 +- src/aks-preview/setup.py | 2 +- src/index.json | 10 +++++----- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/aks-preview/HISTORY.md b/src/aks-preview/HISTORY.md index 07ebe72c14e..dcde332991b 100644 --- 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 index 21060399167..157154a596d 100644 --- 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 index 10287a6bdca..f4d09f1d7e4 100644 --- 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 index 6c9e78fb627..9619489cd47 100644 --- 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": [ @@ -2659,4 +2659,4 @@ ] }, "formatVersion": "1" -} \ No newline at end of file +}