From 0d16cef992ae9c9b8a38448d4dfc85a65cff5038 Mon Sep 17 00:00:00 2001 From: Charlie McBride <33269602+charliedmcb@users.noreply.github.com> Date: Thu, 25 Feb 2021 20:22:30 -0800 Subject: [PATCH] adding autoupgrader node-image channel (#2968) --- src/aks-preview/azext_aks_preview/_consts.py | 1 + src/aks-preview/azext_aks_preview/_help.py | 4 ++-- src/aks-preview/azext_aks_preview/_params.py | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/_consts.py b/src/aks-preview/azext_aks_preview/_consts.py index 8806f7550e9..f320c937964 100644 --- a/src/aks-preview/azext_aks_preview/_consts.py +++ b/src/aks-preview/azext_aks_preview/_consts.py @@ -16,6 +16,7 @@ CONST_RAPID_UPGRADE_CHANNEL = "rapid" CONST_STABLE_UPGRADE_CHANNEL = "stable" CONST_PATCH_UPGRADE_CHANNEL = "patch" +CONST_NODE_IMAGE_UPGRADE_CHANNEL = "node-image" CONST_NONE_UPGRADE_CHANNEL = "none" CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME = "httpApplicationRouting" diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py index 26d9da4442b..304b0e4c40d 100644 --- a/src/aks-preview/azext_aks_preview/_help.py +++ b/src/aks-preview/azext_aks_preview/_help.py @@ -288,7 +288,7 @@ short-summary: Enable SGX quote helper for confcom addon. - name: --auto-upgrade-channel type: string - short-summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch or none, none means disable autoupgrade. + short-summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade. - name: --kubelet-config type: string short-summary: Kubelet configurations for agent nodes. @@ -459,7 +459,7 @@ short-summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2 - name: --auto-upgrade-channel type: string - short-summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch or none, none means disable autoupgrade. + short-summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade. - name: --enable-managed-identity type: bool short-summary: (PREVIEW) Update current cluster to managed identity to manage cluster resource group. diff --git a/src/aks-preview/azext_aks_preview/_params.py b/src/aks-preview/azext_aks_preview/_params.py index 6e51e207801..b72b5db1e4c 100644 --- a/src/aks-preview/azext_aks_preview/_params.py +++ b/src/aks-preview/azext_aks_preview/_params.py @@ -29,7 +29,7 @@ CONST_SPOT_EVICTION_POLICY_DELETE, CONST_SPOT_EVICTION_POLICY_DEALLOCATE, \ CONST_NODEPOOL_MODE_SYSTEM, CONST_NODEPOOL_MODE_USER, \ CONST_OS_DISK_TYPE_MANAGED, CONST_OS_DISK_TYPE_EPHEMERAL, \ - CONST_RAPID_UPGRADE_CHANNEL, CONST_STABLE_UPGRADE_CHANNEL, CONST_PATCH_UPGRADE_CHANNEL, CONST_NONE_UPGRADE_CHANNEL + CONST_RAPID_UPGRADE_CHANNEL, CONST_STABLE_UPGRADE_CHANNEL, CONST_PATCH_UPGRADE_CHANNEL, CONST_NODE_IMAGE_UPGRADE_CHANNEL, CONST_NONE_UPGRADE_CHANNEL def load_arguments(self, _): @@ -112,7 +112,7 @@ def load_arguments(self, _): c.argument('enable_managed_identity', action='store_true') c.argument('assign_identity', type=str, validator=validate_assign_identity) c.argument('enable_sgxquotehelper', action='store_true') - c.argument('auto_upgrade_channel', arg_type=get_enum_type([CONST_RAPID_UPGRADE_CHANNEL, CONST_STABLE_UPGRADE_CHANNEL, CONST_PATCH_UPGRADE_CHANNEL, CONST_NONE_UPGRADE_CHANNEL])) + c.argument('auto_upgrade_channel', arg_type=get_enum_type([CONST_RAPID_UPGRADE_CHANNEL, CONST_STABLE_UPGRADE_CHANNEL, CONST_PATCH_UPGRADE_CHANNEL, CONST_NODE_IMAGE_UPGRADE_CHANNEL, CONST_NONE_UPGRADE_CHANNEL])) c.argument('kubelet_config', type=str) c.argument('linux_os_config', type=str) c.argument('enable_pod_identity', action='store_true') @@ -146,7 +146,7 @@ def load_arguments(self, _): c.argument('attach_acr', acr_arg_type, validator=validate_acr) c.argument('detach_acr', acr_arg_type, validator=validate_acr) c.argument('aks_custom_headers') - c.argument('auto_upgrade_channel', arg_type=get_enum_type([CONST_RAPID_UPGRADE_CHANNEL, CONST_STABLE_UPGRADE_CHANNEL, CONST_PATCH_UPGRADE_CHANNEL, CONST_NONE_UPGRADE_CHANNEL])) + c.argument('auto_upgrade_channel', arg_type=get_enum_type([CONST_RAPID_UPGRADE_CHANNEL, CONST_STABLE_UPGRADE_CHANNEL, CONST_PATCH_UPGRADE_CHANNEL, CONST_NODE_IMAGE_UPGRADE_CHANNEL, CONST_NONE_UPGRADE_CHANNEL])) c.argument('enable_managed_identity', action='store_true') c.argument('assign_identity', type=str, validator=validate_assign_identity) c.argument('enable_pod_identity', action='store_true')