{AKS} az aks nodepool add/update/upgrade: add new parameter --node-soak-duration #6865

MaxHorstmann · 2023-10-17T14:15:11Z

Related command

az aks nodepool add/update/upgrade --node-soak-duration

nodeSoakDuration was added to 2023-09-02-preview

General Guidelines

Have you run azdev style <YOUR_EXT> locally? (pip install azdev required)
Have you run python scripts/ci/test_index.py -q locally? (pip install wheel==0.30.0 required)

About Extension Publish

There is a pipeline to automatically build, upload and publish extension wheels.
Once your pull request is merged into main branch, a new pull request will be created to update src/index.json automatically.
You only need to update the version information in file setup.py and historical information in file HISTORY.rst in your PR but do not modify src/index.json.

azure-client-tools-bot-prd · 2023-10-17T14:15:15Z

❌Azure CLI Extensions Breaking Change Test

❌aks-preview

rule cmd_name rule_message suggest_message

❌ 1010 - ParaPropUpdate aks nodepool add cmd aks nodepool add update parameter spot_max_price: updated property default from nan to nan please change property default from nan to nan for parameter spot_max_price of cmd aks nodepool add

⚠️ 1006 - ParaAdd aks nodepool add cmd aks nodepool add added parameter drain_timeout

⚠️ 1006 - ParaAdd aks nodepool add cmd aks nodepool add added parameter node_soak_duration

⚠️ 1006 - ParaAdd aks nodepool update cmd aks nodepool update added parameter drain_timeout

⚠️ 1006 - ParaAdd aks nodepool update cmd aks nodepool update added parameter node_soak_duration

⚠️ 1006 - ParaAdd aks nodepool upgrade cmd aks nodepool upgrade added parameter drain_timeout

⚠️ 1006 - ParaAdd aks nodepool upgrade cmd aks nodepool upgrade added parameter node_soak_duration

azure-client-tools-bot-prd · 2023-10-17T14:15:18Z

Hi @MaxHorstmann,
Please write the description of changes which can be perceived by customers into HISTORY.rst.
If you want to release a new extension version, please update the version in setup.py as well.

yonzhan · 2023-10-17T14:15:26Z

AKS

FumingZhang

lgtm

Please also add a live test (e2e test) case corresponding to the newly added option, may refer to examples in test_aks_commands.py. Don't forget to commit the recording file for the new test case. Get the recording file by running the test case in live mode locally or rerunning the pipeline (set pipeline line variable EXT_TEST_COVERAGE to your test case name, if there are multiple, separate them with spaces) once test passed, recording file will be uploaded to pipeline artifact.

FumingZhang · 2023-10-18T06:06:46Z

src/aks-preview/azext_aks_preview/custom.py

+            'Conflicting flags. Unable to specify max-surge/drain-timeout/node-soak-duration with node-image-only.'
+            'If you want to use max-surge/drain-timeout/node-soak-duration with a node image upgrade, please first '
+            'update max-surge/drain-timeout/node-soak-duration using "az aks nodepool update --max-surge/--drain-timeout/--node-soak-duration".'


This error message should be the description of the exception on line 1232?

Indeed! Fixed

FumingZhang · 2023-10-18T06:07:00Z

src/aks-preview/azext_aks_preview/custom.py

        )

    # Note: we exclude this option because node image upgrade can't accept nodepool put fields like max surge
-    if max_surge and node_image_only:
+    if (max_surge or drain_timeout or node_soak_duration) and node_image_only::


extra trailing colon

FumingZhang · 2023-10-19T03:00:24Z

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

@@ -1837,6 +1837,45 @@ def test_aks_create_add_nodepool_with_custom_ca_trust_certificates(self, resourc
        self.cmd(
            'aks delete -g {resource_group} -n {name} --yes --no-wait', checks=[self.is_empty()])

+    @AllowLargeResponse()
+    @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2')
+    def test_aks_nodepool_node_soak_duration(self, resource_group, resource_group_location):


Queued live test to validate the change.

Thanks @FumingZhang! Checking why it failed.

Btw

echo 'Live test failed!' echo 'Please refer to this wiki (https://dev.azure.com/msazure/CloudNativeCompute/_wiki/wikis/CloudNativeCompute.wiki/156735/AZCLI-AKS-Live-Unit-Test-Pipeline) for troubleshooting guidelines.'

Looks like that wiki link is outdated. I updated the WIKI_LINK pipeline variable here, was that the correct url?

@FumingZhang so, it looks like the live test is currently failing

Query 'upgradeSettings.nodeSoakDurationInMinutes' doesn't yield expected value '5', instead the actual value is 'None'

I noticed that your 2023-09-02-preview branch (which contains the Swagger change for this feature) in Azure/azure-rest-api-specs hasn't been merged yet - I guess that explains it? Let's re-run the test after the Swagger change is merged.

Yes, swagger/sdk has not been updated, so the deserialized response will not include this property.

@FumingZhang I saw that you merged your 2023-09-02-preview Swagger PR Azure/azure-rest-api-specs#26313

so I synced this with the Azure/azure-cli-extensions upstream in order to pull in the SDK update

and queued up another live test

am I doing this right? :)

SDK not updated yet, rebase/merge from main once this PR #6904 got merged

Thx - looks like that PR just got merged.

synced/merged this branch.

queued up new live test

Seems live test passed, please commit the recording files corresponding to the newly added test cases (find from pipeline artifact).

Please also fix errors in Static Analysis.

Seems live test passed, please commit the recording files corresponding to the newly added test cases (find from pipeline artifact)

done

Please also fix errors in Static Analysis.

done

MaxHorstmann · 2023-10-27T19:51:26Z

@FumingZhang any idea why some of these checks failed? The only error message I see is

Bash exited with code '1'.

FumingZhang · 2023-10-30T08:27:04Z

@FumingZhang any idea why some of these checks failed? The only error message I see is
Bash exited with code '1'.

The failure is about test case

FAILED src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py::AzureKubernetesServiceScenarioTest::test_aks_nodepool_drain_timeout

and seems the recording file corresponding to this case is not committed.

Queue new live test for this test case.

MaxHorstmann · 2023-10-30T13:23:40Z

and seems the recording file corresponding to this case is not committed.

Queue new live test for this test case.

Thanks @FumingZhang, I added the recording. Let's see if all the checks pass now.

FumingZhang

LGTM

MaxHorstmann · 2023-10-31T13:20:00Z

Thanks @FumingZhang! Anything else I need to do to get this merged?

yonzhan · 2023-11-06T23:04:20Z

Please fix conflicting files.

MaxHorstmann · 2023-11-06T23:59:09Z

@yonzhan @FumingZhang

Please fix conflicting files.

done

zhoxing-ms · 2023-11-07T02:06:30Z

src/aks-preview/HISTORY.rst

+0.5.169
+++++++
+* Add `--node-soak-duration` to the `az aks nodepool add/update/upgrade` commands.
+* Add `--drain-timeout` to the `az aks nodepool add/update/upgrade` commands (already in [azure-cli](https://github.com/Azure/azure-cli/pull/27475)).


Same as #6881 (comment)

azclibot · 2023-11-07T05:46:48Z

[Release] Update index.json for extension [ aks-preview ] : https://dev.azure.com/azclitools/internal/_build/results?buildId=104441&view=results

add helpers

24051cc

azure-client-tools-bot-prd bot added this to the October 2023 (2023-11-15) milestone Oct 17, 2023

microsoft-github-policy-service bot requested review from zhoxing-ms, yanzhudd, yonzhan and FumingZhang October 17, 2023 14:15

microsoft-github-policy-service bot assigned yanzhudd and zhoxing-ms Oct 17, 2023

microsoft-github-policy-service bot added Auto-Assign Auto assign by bot AKS labels Oct 17, 2023

MaxHorstmann mentioned this pull request Oct 17, 2023

{AKS} az aks nodepool add/update/upgrade: Add new parameter --node-soak-duration Azure/azure-cli#27604

Merged

3 tasks

MaxHorstmann added 5 commits October 17, 2023 10:31

params

9757b4c

decorator

8d67f37

add custom.py

e83bcd4

add drain_timeout parameter too for compatibility

bfa49df

add version info/history

0e32794

FumingZhang reviewed Oct 18, 2023

View reviewed changes

MaxHorstmann added 3 commits October 18, 2023 13:28

update the right error message

299794b

remove extra trailing colon

ef6e6b6

add test

cef3bd3

FumingZhang reviewed Oct 19, 2023

View reviewed changes

MaxHorstmann added 6 commits October 20, 2023 13:23

Merge branch 'main' into maxhorstmann/node-soak-duration

28b43ae

add help for --drain-timeout

f09241c

add get_drain_timeout

78ef18d

mention drain-timeout in history

68f7106

add drain_timeout to params

619b321

add test_aks_nodepool_drain_timeout

6203789

MaxHorstmann added 5 commits October 25, 2023 14:52

Merge branch 'main' into maxhorstmann/node-soak-duration

2cf9d11

Merge branch 'main' into maxhorstmann/node-soak-duration

ded40ef

Merge branch 'main' into maxhorstmann/node-soak-duration

ee6bcf5

fix static analysis errors (blank lines)

67055f2

add test recording

1b1eca3

MaxHorstmann marked this pull request as ready for review October 27, 2023 13:33

MaxHorstmann requested a review from andyliuliming as a code owner October 27, 2023 13:33

MaxHorstmann requested a review from FumingZhang October 27, 2023 13:38

MaxHorstmann added 2 commits October 30, 2023 09:21

Merge branch 'main' into maxhorstmann/node-soak-duration

cc2d908

add test recording for drain timeout

60e191b

FumingZhang approved these changes Oct 31, 2023

View reviewed changes

Merge branch 'main' into maxhorstmann/node-soak-duration

5722956

zhoxing-ms reviewed Nov 7, 2023

View reviewed changes

zhoxing-ms approved these changes Nov 7, 2023

View reviewed changes

zhoxing-ms merged commit b46a12d into Azure:main Nov 7, 2023
14 checks passed

MaxHorstmann deleted the maxhorstmann/node-soak-duration branch November 7, 2023 13:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

{AKS} az aks nodepool add/update/upgrade: add new parameter --node-soak-duration #6865

{AKS} az aks nodepool add/update/upgrade: add new parameter --node-soak-duration #6865

MaxHorstmann commented Oct 17, 2023 •

edited

Loading

azure-client-tools-bot-prd bot commented Oct 17, 2023 •

edited

Loading

azure-client-tools-bot-prd bot commented Oct 17, 2023

yonzhan commented Oct 17, 2023

FumingZhang left a comment

FumingZhang Oct 18, 2023

MaxHorstmann Oct 18, 2023

FumingZhang Oct 18, 2023

MaxHorstmann Oct 18, 2023

FumingZhang Oct 19, 2023

MaxHorstmann Oct 19, 2023

MaxHorstmann Oct 19, 2023

FumingZhang Oct 20, 2023

MaxHorstmann Oct 25, 2023

FumingZhang Oct 26, 2023

MaxHorstmann Oct 26, 2023

FumingZhang Oct 27, 2023

MaxHorstmann Oct 27, 2023

MaxHorstmann commented Oct 27, 2023

FumingZhang commented Oct 30, 2023

MaxHorstmann commented Oct 30, 2023

FumingZhang left a comment

MaxHorstmann commented Oct 31, 2023

yonzhan commented Nov 6, 2023

MaxHorstmann commented Nov 6, 2023

zhoxing-ms Nov 7, 2023

azclibot commented Nov 7, 2023

{AKS} az aks nodepool add/update/upgrade: add new parameter --node-soak-duration #6865

{AKS} az aks nodepool add/update/upgrade: add new parameter --node-soak-duration #6865

Conversation

MaxHorstmann commented Oct 17, 2023 • edited Loading

Related command

General Guidelines

About Extension Publish

azure-client-tools-bot-prd bot commented Oct 17, 2023 • edited Loading

azure-client-tools-bot-prd bot commented Oct 17, 2023

yonzhan commented Oct 17, 2023

FumingZhang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MaxHorstmann commented Oct 27, 2023

FumingZhang commented Oct 30, 2023

MaxHorstmann commented Oct 30, 2023

FumingZhang left a comment

Choose a reason for hiding this comment

MaxHorstmann commented Oct 31, 2023

yonzhan commented Nov 6, 2023

MaxHorstmann commented Nov 6, 2023

Choose a reason for hiding this comment

azclibot commented Nov 7, 2023

MaxHorstmann commented Oct 17, 2023 •

edited

Loading

azure-client-tools-bot-prd bot commented Oct 17, 2023 •

edited

Loading