From 13c253385b08cd43b07bb0b6830ccf037a524ab0 Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Tue, 3 May 2022 17:01:08 -0700 Subject: [PATCH] No default values for the patch scenario with extension (#122) --- src/k8s-extension/azext_k8s_extension/custom.py | 12 +++++++----- .../vendored_sdks/v2022_03_01/models/_models_py3.py | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/k8s-extension/azext_k8s_extension/custom.py b/src/k8s-extension/azext_k8s_extension/custom.py index abff15a0246..49e392ddbae 100644 --- a/src/k8s-extension/azext_k8s_extension/custom.py +++ b/src/k8s-extension/azext_k8s_extension/custom.py @@ -226,9 +226,9 @@ def update_k8s_extension( cluster_name, name, cluster_type, - auto_upgrade_minor_version="", - release_train="", - version="", + auto_upgrade_minor_version=None, + release_train=None, + version=None, configuration_settings=None, configuration_protected_settings=None, configuration_settings_file=None, @@ -261,13 +261,14 @@ def update_k8s_extension( ) extension_type_lower = extension.extension_type.lower() - config_settings = {} - config_protected_settings = {} + config_settings = None + config_protected_settings = None # Get Configuration Settings from file if configuration_settings_file is not None: config_settings = read_config_settings_file(configuration_settings_file) if configuration_settings is not None: + config_settings = {} for dicts in configuration_settings: for key, value in dicts.items(): config_settings[key] = value @@ -279,6 +280,7 @@ def update_k8s_extension( ) if configuration_protected_settings is not None: + config_protected_settings = {} for dicts in configuration_protected_settings: for key, value in dicts.items(): config_protected_settings[key] = value diff --git a/src/k8s-extension/azext_k8s_extension/vendored_sdks/v2022_03_01/models/_models_py3.py b/src/k8s-extension/azext_k8s_extension/vendored_sdks/v2022_03_01/models/_models_py3.py index 0519413294b..d3ddc1536de 100644 --- a/src/k8s-extension/azext_k8s_extension/vendored_sdks/v2022_03_01/models/_models_py3.py +++ b/src/k8s-extension/azext_k8s_extension/vendored_sdks/v2022_03_01/models/_models_py3.py @@ -1714,8 +1714,8 @@ class PatchExtension(msrest.serialization.Model): def __init__( self, *, - auto_upgrade_minor_version: Optional[bool] = True, - release_train: Optional[str] = "Stable", + auto_upgrade_minor_version: Optional[bool] = None, + release_train: Optional[str] = None, version: Optional[str] = None, configuration_settings: Optional[Dict[str, str]] = None, configuration_protected_settings: Optional[Dict[str, str]] = None,