Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
+++++++

18.0.0b34
+++++++
* Add machines agent pool support for `az aks nodepool add` command.

18.0.0b33
+++++++
* `az aks create`: Add new parameter `--kms-infrastructure-encryption` to enable KMS infrastructure encryption.
Expand Down
1 change: 1 addition & 0 deletions src/aks-preview/azext_aks_preview/_consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
CONST_NODEPOOL_MODE_USER = "User"
CONST_NODEPOOL_MODE_GATEWAY = "Gateway"
CONST_NODEPOOL_MODE_MANAGEDSYSTEM = "ManagedSystem"
CONST_NODEPOOL_MODE_MACHINES = "Machines"

# os type
CONST_DEFAULT_NODE_OS_TYPE = "Linux"
Expand Down
2 changes: 2 additions & 0 deletions src/aks-preview/azext_aks_preview/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
CONST_NODEPOOL_MODE_USER,
CONST_NODEPOOL_MODE_GATEWAY,
CONST_NODEPOOL_MODE_MANAGEDSYSTEM,
CONST_NODEPOOL_MODE_MACHINES,
CONST_NONE_UPGRADE_CHANNEL,
CONST_NRG_LOCKDOWN_RESTRICTION_LEVEL_READONLY,
CONST_NRG_LOCKDOWN_RESTRICTION_LEVEL_UNRESTRICTED,
Expand Down Expand Up @@ -265,6 +266,7 @@
CONST_NODEPOOL_MODE_USER,
CONST_NODEPOOL_MODE_GATEWAY,
CONST_NODEPOOL_MODE_MANAGEDSYSTEM,
CONST_NODEPOOL_MODE_MACHINES,
]
node_os_skus_create = [
CONST_OS_SKU_AZURELINUX,
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4116,6 +4116,41 @@ def test_aks_nodepool_delete_machines(self, resource_group, resource_group_locat
checks=[self.is_empty()],
)

@AllowLargeResponse()
@AKSCustomResourceGroupPreparer(
random_name_length=17, name_prefix="clitest", location="westus2"
)
def test_aks_nodepool_create_machines_pool(self, resource_group, resource_group_location):
aks_name = self.create_random_name("cliakstest", 16)
nodepool_name = self.create_random_name("c", 6)
self.kwargs.update(
{
"resource_group": resource_group,
"location": resource_group_location,
"name": aks_name,
"nodepool_name": nodepool_name,
"ssh_key_value": self.generate_ssh_keys(),
}
)
# create aks cluster
create_cmd = "aks create --resource-group={resource_group} --name={name} --ssh-key-value={ssh_key_value}"
self.cmd(
create_cmd,
checks=[
self.check("provisioningState", "Succeeded"),
],
)
# add machines nodepool
self.cmd(
"aks nodepool add --resource-group={resource_group} --cluster-name={name} --name={nodepool_name} --mode=Machines",
checks=[self.check("provisioningState", "Succeeded"), self.check("mode", "Machines")],
)
# delete AKS cluster
self.cmd(
"aks delete -g {resource_group} -n {name} --yes --no-wait",
checks=[self.is_empty()],
)

@AllowLargeResponse()
@AKSCustomResourceGroupPreparer(
random_name_length=17,
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from setuptools import find_packages, setup

VERSION = "18.0.0b33"
VERSION = "18.0.0b34"

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