Skip to content

[AKS] az aks create: Add support for Windows#13084

Merged
arrownj merged 1 commit intoAzure:devfrom
AbelHu:dev
Apr 23, 2020
Merged

[AKS] az aks create: Add support for Windows#13084
arrownj merged 1 commit intoAzure:devfrom
AbelHu:dev

Conversation

@AbelHu
Copy link
Member

@AbelHu AbelHu commented Apr 19, 2020

Description
This will allow cx to create a k8s cluster and then add Windows agent pools without aks-preview.

Testing Guide
AZURE_CLI_TEST_DEV_SP_NAME=1f3a7c5e-1812-4aa7-bffe-b5ef651cbab2 AZURE_CLI_TEST_DEV_SP_PASSWORD='6997d05f-3cae-4bcc-95f0-b74cf5444860' CAZURE_CLI_TEST_MODULES=acs azdev test test_aks_create_with_windows --discover --live

History Notes

This checklist is used to make sure that common guidelines for a pull request are followed.

@AbelHu AbelHu requested a review from arrownj as a code owner April 19, 2020 13:57
@yungezz yungezz added the AKS az aks/acs/openshift label Apr 19, 2020
@yungezz yungezz added this to the S169 - For Build milestone Apr 19, 2020
@yungezz
Copy link
Member

yungezz commented Apr 19, 2020

HI @arrownj could you pls review? thanks

Copy link
Contributor

@arrownj arrownj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AbelHu
Copy link
Member Author

AbelHu commented Apr 20, 2020

Thanks for the help, @arrownj . Please do not merge this. I will update add-node-pool with setting default node vm size for windows but not raise an error.

@AbelHu
Copy link
Member Author

AbelHu commented Apr 20, 2020

Updated src\azure-cli\azure\cli\command_modules\acs\custom.py and added `add/delete windows node pool' in test_aks_commands.py
Change Line 2826

    if node_vm_size is None:
        if os_type.lower() == "windows":
            raise CLIError('Windows nodepool is not supported')
        node_vm_size = "Standard_DS2_v2"

=>

    if node_vm_size is None:
        if os_type == "Windows":
            node_vm_size = "Standard_D2s_v3"
        else:
            node_vm_size = "Standard_DS2_v2"

@arrownj
Copy link
Contributor

arrownj commented Apr 22, 2020

Hi @AbelHu , is this ready to merge ? Code looks good to me.

@AbelHu
Copy link
Member Author

AbelHu commented Apr 22, 2020

@arrownj . It is ready now. Expect your help to merge it. Thanks.

@arrownj arrownj merged commit 21172d9 into Azure:dev Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AKS az aks/acs/openshift

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants