Skip to content

Commit ae51301

Browse files
committed
bump helm version
1 parent 6bb9ac8 commit ae51301

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

src/aks-agent/azext_aks_agent/_consts.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@
4444
AGENT_NAMESPACE = "kube-system"
4545
AGENT_LABEL_SELECTOR = "app.kubernetes.io/name=aks-agent"
4646
AKS_MCP_LABEL_SELECTOR = "app.kubernetes.io/name=aks-mcp"
47+
48+
# Helm Configuration
49+
HELM_VERSION = "3.16.0"

src/aks-agent/azext_aks_agent/agent/k8s/helm_manager.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from pathlib import Path
1616
from typing import List, Optional, Tuple
1717

18+
from azext_aks_agent._consts import HELM_VERSION
1819
from knack.log import get_logger
1920

2021
logger = get_logger(__name__)
@@ -31,13 +32,13 @@ class HelmManager:
3132
- Share helm functionality across different chart deployments
3233
"""
3334

34-
def __init__(self, helm_version: str = "3.14.0", local_bin_dir: Optional[str] = None,
35+
def __init__(self, helm_version: str = HELM_VERSION, local_bin_dir: Optional[str] = None,
3536
kubeconfig_path: Optional[str] = None):
3637
"""
3738
Initialize the Helm Manager.
3839
3940
Args:
40-
helm_version: Helm version to use (default: '3.14.0')
41+
helm_version: Helm version to use (default: HELM_VERSION from _consts)
4142
local_bin_dir: Local directory for helm binary (default: ~/.aks-agent/bin)
4243
kubeconfig_path: Path to kubeconfig file (default: None - use default config)
4344
"""
@@ -311,13 +312,13 @@ def repo_update(self) -> bool:
311312
return success
312313

313314

314-
def create_helm_manager(helm_version: str = "3.14.0",
315+
def create_helm_manager(helm_version: str = HELM_VERSION,
315316
local_bin_dir: Optional[str] = None) -> HelmManager:
316317
"""
317318
Factory function to create a HelmManager instance.
318319
319320
Args:
320-
helm_version: Helm version to use
321+
helm_version: Helm version to use (default: HELM_VERSION from _consts)
321322
local_bin_dir: Local directory for helm binary
322323
323324
Returns:

src/aks-agent/azext_aks_agent/tests/latest/test_helm_manager.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
"""
99

1010
import os
11-
import platform
12-
import subprocess
1311
import tempfile
1412
import unittest
1513
from pathlib import Path
16-
from unittest.mock import MagicMock, Mock, mock_open, patch
14+
from unittest.mock import Mock, mock_open, patch
1715

16+
from azext_aks_agent._consts import HELM_VERSION
1817
from azext_aks_agent.agent.k8s.helm_manager import HelmManager
1918

2019

@@ -23,7 +22,7 @@ class TestHelmManager(unittest.TestCase):
2322

2423
def setUp(self):
2524
"""Set up test fixtures."""
26-
self.test_helm_version = "3.14.0"
25+
self.test_helm_version = HELM_VERSION
2726
self.test_kubeconfig = "/mock/kubeconfig"
2827
self.test_bin_dir = "/mock/bin"
2928

@@ -35,7 +34,7 @@ def test_init_default_values(self, mock_ensure_helm, mock_mkdir):
3534

3635
manager = HelmManager()
3736

38-
self.assertEqual(manager.helm_version, "3.14.0")
37+
self.assertEqual(manager.helm_version, "3.16.0")
3938
self.assertIsNone(manager.kubeconfig_path)
4039
self.assertIsNotNone(manager.local_bin_dir)
4140
mock_mkdir.assert_called_once()
@@ -171,15 +170,15 @@ def test_get_version(self, mock_ensure_helm, mock_mkdir, mock_run):
171170
mock_ensure_helm.return_value = "/mock/helm"
172171
mock_run.return_value = Mock(
173172
returncode=0,
174-
stdout="version.BuildInfo{Version:\"v3.14.0\"}",
173+
stdout="version.BuildInfo{Version:\"v3.16.0\"}",
175174
stderr=""
176175
)
177176

178177
manager = HelmManager()
179178
version = manager.get_version()
180179

181180
self.assertIsNotNone(version)
182-
self.assertIn("3.14.0", version)
181+
self.assertIn("3.16.0", version)
183182

184183
@patch('azext_aks_agent.agent.k8s.helm_manager.subprocess.run')
185184
@patch('azext_aks_agent.agent.k8s.helm_manager.Path.mkdir')
@@ -227,7 +226,7 @@ class TestHelmManagerRealDownload(unittest.TestCase):
227226

228227
def setUp(self):
229228
"""Set up test fixtures."""
230-
self.test_helm_version = "3.14.0"
229+
self.test_helm_version = HELM_VERSION
231230
self.temp_dir = None
232231

233232
def tearDown(self):
@@ -249,7 +248,7 @@ def test_real_download_all_platforms(self):
249248
("darwin", "amd64"),
250249
("darwin", "arm64"),
251250
("windows", "amd64"),
252-
# ("windows", "arm64"), # The blob does not exist for this platform
251+
("windows", "arm64"),
253252
]
254253

255254
for os_name, arch in platforms:

0 commit comments

Comments
 (0)