From 96e2728b6e9bda75f8dae30cb6911787ee9967e3 Mon Sep 17 00:00:00 2001 From: m-chau <14900903+m-chau@users.noreply.github.com> Date: Fri, 7 Nov 2025 23:32:32 +0000 Subject: [PATCH 1/6] update prompt --- src/aks-preview/azext_aks_preview/custom.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index dbb9b810507..e8745e605fb 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -1260,8 +1260,10 @@ def aks_upgrade(cmd, upgrade_all = True else: msg = ( - "Since control-plane-only argument is specified, this will upgrade only the control plane to " - f"{instance.kubernetes_version}. Node pool will not change. Continue?" + "Since control-plane-only argument is specified, this will upgrade only the kubernetes version of the control plane to " + f"{instance.kubernetes_version}. Kubernetes versions of the node pools will remain unchanged, " + "but node image version may be upgraded if there has been cluster config change that requires VM reimage. " + "Continue?" ) if not yes and not prompt_y_n(msg, default="n"): return None From 40611bab14c3b44d83e0d1c77cce461aff213b8b Mon Sep 17 00:00:00 2001 From: m-chau <14900903+m-chau@users.noreply.github.com> Date: Fri, 7 Nov 2025 23:47:28 +0000 Subject: [PATCH 2/6] update versions --- src/aks-preview/HISTORY.rst | 4 ++++ src/aks-preview/setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index cc523c3d42a..aadaf3a17c4 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -13,6 +13,10 @@ Pending +++++++ * Add option `Windows2025` to `--os-sku` for `az aks nodepool add`. +18.0.0b40 ++++++++ +* Update user prompt for `az aks upgrade` command to clarify the implication of the `--control-plane-only` options. + 18.0.0b39 +++++++ * Add option `AzureLinuxOSGuard` and `AzureLinux3OSGuard` to `--os-sku` for `az aks nodepool add` and `az aks nodepool update`. diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index bc8c9863fc3..3fc6651cc8a 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import find_packages, setup -VERSION = "18.0.0b39" +VERSION = "18.0.0b40" CLASSIFIERS = [ "Development Status :: 4 - Beta", From d02d467b74bc08785a06f9f66251a0fed4ba5a47 Mon Sep 17 00:00:00 2001 From: m-chau <14900903+m-chau@users.noreply.github.com> Date: Wed, 3 Dec 2025 11:42:58 -0800 Subject: [PATCH 3/6] update wordings to match GA CLI --- src/aks-preview/azext_aks_preview/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index e8745e605fb..dbf00e1d08b 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -1260,7 +1260,7 @@ def aks_upgrade(cmd, upgrade_all = True else: msg = ( - "Since control-plane-only argument is specified, this will upgrade only the kubernetes version of the control plane to " + "Since --control-plane-only parameter is specified, this will upgrade only the kubernetes version of the control plane to " f"{instance.kubernetes_version}. Kubernetes versions of the node pools will remain unchanged, " "but node image version may be upgraded if there has been cluster config change that requires VM reimage. " "Continue?" From 4b157621d7f25bdabdeb80de418a43e70818114d Mon Sep 17 00:00:00 2001 From: m-chau <14900903+m-chau@users.noreply.github.com> Date: Wed, 3 Dec 2025 11:54:50 -0800 Subject: [PATCH 4/6] Update version to 19.0.0b17 --- src/aks-preview/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index 3fc6651cc8a..67b4629cef2 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import find_packages, setup -VERSION = "18.0.0b40" +VERSION = "19.0.0b17" CLASSIFIERS = [ "Development Status :: 4 - Beta", From a4445fa605fc1b1daaa91bb9a7b0fa3d87dbcfeb Mon Sep 17 00:00:00 2001 From: m-chau <14900903+m-chau@users.noreply.github.com> Date: Wed, 3 Dec 2025 11:55:24 -0800 Subject: [PATCH 5/6] Remove entry for version 18.0.0b40 Removed version 18.0.0b40 entry from HISTORY.rst. --- src/aks-preview/HISTORY.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index aadaf3a17c4..df07f7d4005 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -12,9 +12,6 @@ To release a new version, please select a new version number (usually plus 1 to Pending +++++++ * Add option `Windows2025` to `--os-sku` for `az aks nodepool add`. - -18.0.0b40 -+++++++ * Update user prompt for `az aks upgrade` command to clarify the implication of the `--control-plane-only` options. 18.0.0b39 @@ -2002,4 +1999,4 @@ Pending +++++ * new feature `enable-cluster-autoscaler` -* default agentType is VMSS \ No newline at end of file +* default agentType is VMSS From 1c9f53816693e7bd7015a662d5bf2ac67566daf5 Mon Sep 17 00:00:00 2001 From: FumingZhang <81607949+FumingZhang@users.noreply.github.com> Date: Thu, 4 Dec 2025 14:03:19 +1100 Subject: [PATCH 6/6] Update src/aks-preview/HISTORY.rst --- src/aks-preview/HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index f22ddc8b04b..4f8be3b677e 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -11,10 +11,10 @@ To release a new version, please select a new version number (usually plus 1 to Pending +++++++ -* `az aks bastion`: Correctly configure `$KUBECONFIG` values for tunneling traffic into a private AKS cluster. 19.0.0b17 +++++++ +* `az aks bastion`: Correctly configure `$KUBECONFIG` values for tunneling traffic into a private AKS cluster. * Update user prompt for `az aks upgrade` command to clarify the implication of the `--control-plane-only` options. 19.0.0b16