From cc860fcc385634fb8d503240f41922832d082ba8 Mon Sep 17 00:00:00 2001 From: Qingchuan Hao Date: Thu, 12 Aug 2021 16:14:44 +0800 Subject: [PATCH] Fix wrongly used containerLogMaxSizeMB in customized kubelet config (#3771) * Correct containerLogMaxSizeMb to containerLogMaxSizeMB in customized kubelet config * add config test for kubeletConfig.containerLogMaxSizeMB --- src/aks-preview/HISTORY.md | 4 ++++ src/aks-preview/azext_aks_preview/custom.py | 2 +- .../tests/latest/data/kubeletconfig.json | 2 +- .../tests/latest/test_aks_commands.py | 11 +++++------ src/aks-preview/setup.py | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/aks-preview/HISTORY.md b/src/aks-preview/HISTORY.md index 3699629bf0c..8021e23beb5 100644 --- a/src/aks-preview/HISTORY.md +++ b/src/aks-preview/HISTORY.md @@ -3,6 +3,10 @@ Release History =============== +0.5.26 ++++++ +* Correct containerLogMaxSizeMb to containerLogMaxSizeMB in customized kubelet config + 0.5.25 +++++ * Add support for http proxy diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 6a7e55af1a8..de70736ec84 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -3991,7 +3991,7 @@ def _get_kubelet_config(file_path): config_object.container_log_max_files = kubelet_config.get( "containerLogMaxFiles", None) config_object.container_log_max_size_mb = kubelet_config.get( - "containerLogMaxSizeMb", None) + "containerLogMaxSizeMB", None) return config_object diff --git a/src/aks-preview/azext_aks_preview/tests/latest/data/kubeletconfig.json b/src/aks-preview/azext_aks_preview/tests/latest/data/kubeletconfig.json index bbea5981549..458af0a35c0 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/data/kubeletconfig.json +++ b/src/aks-preview/azext_aks_preview/tests/latest/data/kubeletconfig.json @@ -11,5 +11,5 @@ ], "failSwapOn": false, "containerLogMaxFiles": 10, - "containerLogMaxSizeMb": 20 + "containerLogMaxSizeMB": 20 } \ No newline at end of file diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index b136ddf2667..8e1b3c5e784 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -1451,12 +1451,10 @@ def test_aks_create_with_node_config(self, resource_group, resource_group_locati '--kubelet-config={kc_path} --linux-os-config={oc_path} --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CustomNodeConfigPreview -o json' self.cmd(create_cmd, checks=[ self.check('provisioningState', 'Succeeded'), - self.check( - 'agentPoolProfiles[0].kubeletConfig.cpuManagerPolicy', 'static'), - self.check( - 'agentPoolProfiles[0].linuxOsConfig.swapFileSizeMb', 1500), - self.check( - 'agentPoolProfiles[0].linuxOsConfig.sysctls.netIpv4TcpTwReuse', True) + self.check('agentPoolProfiles[0].kubeletConfig.cpuManagerPolicy', 'static'), + self.check('agentPoolProfiles[0].kubeletConfig.containerLogMaxSizeMb', 20), + self.check('agentPoolProfiles[0].linuxOsConfig.swapFileSizeMb', 1500), + self.check('agentPoolProfiles[0].linuxOsConfig.sysctls.netIpv4TcpTwReuse', True) ]) # nodepool add @@ -1465,6 +1463,7 @@ def test_aks_create_with_node_config(self, resource_group, resource_group_locati self.cmd(nodepool_cmd, checks=[ self.check('provisioningState', 'Succeeded'), self.check('kubeletConfig.cpuCfsQuotaPeriod', '200ms'), + self.check('kubeletConfig.containerLogMaxSizeMb', 20), self.check('linuxOsConfig.sysctls.netCoreSomaxconn', 163849) ]) diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index 692ab56763f..4beebd08905 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -8,7 +8,7 @@ from codecs import open as open1 from setuptools import setup, find_packages -VERSION = "0.5.25" +VERSION = "0.5.26" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers',