Skip to content

Defaulting vm_size for VMS AP #8741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 3 commits into from
May 14, 2025
Merged

Defaulting vm_size for VMS AP #8741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4f2b4f
Defaulting vm_size for VMS AP
May 14, 2025
cace10f
fix style
May 14, 2025
4f368f4
update version
May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/aks-preview/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ To release a new version, please select a new version number (usually plus 1 to
Pending
+++++++

17.0.0b3
++++++++
* Add default value of option `--vm-sizes` for `az aks create` and `az aks nodepool add`.

17.0.0b2
++++++++
* Add option `--migrate-vmas-to-vms` to `az aks update`
Expand Down
3 changes: 3 additions & 0 deletions src/aks-preview/azext_aks_preview/_consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
CONST_DEFAULT_NODE_VM_SIZE = ""
CONST_DEFAULT_WINDOWS_NODE_VM_SIZE = ""

CONST_DEFAULT_VMS_VM_SIZE = "Standard_DS2_v2"
CONST_DEFAULT_WINDOWS_VMS_VM_SIZE = "Standard_D2s_v3"

# workload runtime
CONST_WORKLOAD_RUNTIME_OCI_CONTAINER = "OCIContainer"
CONST_WORKLOAD_RUNTIME_WASM_WASI = "WasmWasi"
Expand Down
8 changes: 8 additions & 0 deletions src/aks-preview/azext_aks_preview/agentpool_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
CONST_VIRTUAL_MACHINES,
CONST_DEFAULT_NODE_VM_SIZE,
CONST_DEFAULT_WINDOWS_NODE_VM_SIZE,
CONST_DEFAULT_VMS_VM_SIZE,
CONST_DEFAULT_WINDOWS_VMS_VM_SIZE,
CONST_SSH_ACCESS_LOCALUSER,
)
from azext_aks_preview._helpers import (
Expand Down Expand Up @@ -714,6 +716,12 @@ def get_vm_sizes(self) -> List[str]:
vm_sizes = [x.strip() for x in raw_value.split(",")]
else:
vm_sizes = [self.get_node_vm_size()]
# Populate default values if vm_sizes still empty
if vm_sizes == [""]:
if self.get_os_type().lower() == "windows":
vm_sizes = [CONST_DEFAULT_WINDOWS_VMS_VM_SIZE]
else:
vm_sizes = [CONST_DEFAULT_VMS_VM_SIZE]
return vm_sizes

# Overrides azure-cli command to allow changes after create
Expand Down
6 changes: 4 additions & 2 deletions src/aks-preview/azext_aks_preview/tests/latest/test_agentpool_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
)
from azext_aks_preview._consts import (
CONST_DEFAULT_WINDOWS_NODE_VM_SIZE,
CONST_DEFAULT_VMS_VM_SIZE,
CONST_DEFAULT_WINDOWS_VMS_VM_SIZE,
)
from azure.cli.command_modules.acs.agentpool_decorator import AKSAgentPoolParamDict
from azure.cli.command_modules.acs.tests.latest.mocks import (
Expand Down Expand Up @@ -804,7 +806,7 @@ def common_get_vm_sizes(self):
)
agentpool_1 = self.create_initialized_agentpool_instance(os_type="windows")
ctx_1.attach_agentpool(agentpool_1)
self.assertEqual(ctx_1.get_vm_sizes(), [CONST_DEFAULT_WINDOWS_NODE_VM_SIZE])
self.assertEqual(ctx_1.get_vm_sizes(), [CONST_DEFAULT_WINDOWS_VMS_VM_SIZE])

# default
ctx_2 = AKSPreviewAgentPoolContext(
Expand All @@ -816,7 +818,7 @@ def common_get_vm_sizes(self):
)
agentpool_2 = self.create_initialized_agentpool_instance(os_type="linux")
ctx_2.attach_agentpool(agentpool_2)
self.assertEqual(ctx_2.get_vm_sizes(), [CONST_DEFAULT_NODE_VM_SIZE], DeepDiff(ctx_2.get_vm_sizes(), [CONST_DEFAULT_NODE_VM_SIZE]))
self.assertEqual(ctx_2.get_vm_sizes(), [CONST_DEFAULT_VMS_VM_SIZE], DeepDiff(ctx_2.get_vm_sizes(), [CONST_DEFAULT_VMS_VM_SIZE]))

# custom
ctx_3 = AKSPreviewAgentPoolContext(
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from setuptools import setup, find_packages

VERSION = "17.0.0b2"
VERSION = "17.0.0b3"

CLASSIFIERS = [
"Development Status :: 4 - Beta",
Expand Down
Loading