[k8s-extension] ChaosStudio: pass chart version through; bump to 1.9.2

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: brrusino

src/k8s-extension/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.9.2
++++++++++++++++++++
+* Microsoft.ChaosStudio: pass --version through to the extension service; default to the latest registered version instead of pinning chart 0.1.6.
+
 1.9.1
 +++++++++++++++++++
 * Add Fleet support for Kubernetes extension and cluster-scoped extension type commands.

src/k8s-extension/azext_k8s_extension/partner_extensions/ChaosStudio.py

@@ -19,6 +19,7 @@
 from azure.cli.core.util import send_raw_request, sdk_no_wait
 from knack.log import get_logger
 from knack.util import CLIError
+from packaging.version import InvalidVersion, Version
 from ..vendored_sdks.models import Extension, PatchExtension, Scope, ScopeCluster
 from .._client_factory import cf_k8s_extension_types
 from .DefaultExtension import DefaultExtension
@@ -104,7 +105,6 @@ class ChaosStudio(DefaultExtension):
     DEFAULT_CLUSTER_TYPE = "managedclusters"
     DEFAULT_RELEASE_NAMESPACE = "chaos-infrastructure"
     DEFAULT_RELEASE_TRAIN = "dev"
-    DEFAULT_VERSION = "0.1.6"
     WORKSPACE_ID_KEY = "chaos-workspace-id"
     EXISTING_ROLE_KEY = "chaos-existing-role-definition-id"
 
@@ -191,7 +191,12 @@ def Create(
         )
         if not workspace_id:
             raise InvalidArgumentValueError("'chaos-workspace-id' is required.")
-        self._validate_version(version or self.DEFAULT_VERSION)
+        release_train = release_train or self.DEFAULT_RELEASE_TRAIN
+        if not version:
+            # auto-upgrade is forced off, so the extension RP needs an explicit version.
+            version = self._latest_registered_version(
+                cmd, resource_group_name, cluster_rp, cluster_type, cluster_name, release_train
+            )
         release_namespace = self._resolve_release_namespace(
             release_namespace
         )
@@ -207,23 +212,33 @@ def Create(
             extension_type=extension_type,
             auto_upgrade_minor_version=False,
             auto_upgrade_mode=None,
-            release_train=release_train or self.DEFAULT_RELEASE_TRAIN,
-            version=version or self.DEFAULT_VERSION,
+            release_train=release_train,
+            version=version,
             scope=extension_scope,
             configuration_settings=configuration_settings,
             configuration_protected_settings=configuration_protected_settings,
         )
         return extension, name, False
 
-    @classmethod
-    def _validate_version(cls, version):
-        # Only the coordinated bootstrap contract is known compatible. Availability
-        # remains an extension-RP registration check, not a version-number inference.
-        if version != cls.DEFAULT_VERSION:
+    @staticmethod
+    def _latest_registered_version(cmd, resource_group_name, cluster_rp, cluster_type, cluster_name, release_train):
+        versions = cf_k8s_extension_types(cmd.cli_ctx).cluster_list_versions(
+            resource_group_name, cluster_rp, cluster_type, cluster_name,
+            "Microsoft.ChaosStudio", release_train=release_train,
+        )
+        candidates = []
+        for item in versions or []:
+            value = getattr(getattr(item, "properties", None), "version", None)
+            try:
+                candidates.append((Version(value), value))
+            except (InvalidVersion, TypeError):
+                continue
+        if not candidates:
             raise InvalidArgumentValueError(
-                "Microsoft.ChaosStudio staged installation requires chart {}. "
-                "It must be published and registered before installation.".format(cls.DEFAULT_VERSION)
+                "No Microsoft.ChaosStudio version is registered for this cluster on release train '{}'. "
+                "Pass --version once one is available.".format(release_train)
             )
+        return max(candidates)[1]
 
     @classmethod
     def _reject_managed_overrides(cls, *settings):
@@ -264,7 +279,6 @@ def _stage(cls, extension):
                 "The existing extension is not a staged platform-identity installation. "
                 "Automatic migration of older manual identities is not supported."
             )
-        cls._validate_version(extension.version)
         return value
 
     def Install(self, cmd, client, resource_group_name, cluster_rp, cluster_type,
@@ -451,7 +465,6 @@ def Update(
             configuration_protected_settings or {}
         )
         self._reject_managed_overrides(supplied_settings, configuration_protected_settings)
-        self._validate_version(version or original_extension.version)
         if self._stage(original_extension) != "true":
             raise InvalidArgumentValueError("Resume bootstrap with create before updating settings.")
         self._require_success(original_extension)
@@ -504,11 +517,7 @@ def Update(
                 or getattr(original_extension, "release_train", None)
                 or self.DEFAULT_RELEASE_TRAIN
             ),
-            version=(
-                version
-                or getattr(original_extension, "version", None)
-                or self.DEFAULT_VERSION
-            ),
+            version=version or getattr(original_extension, "version", None),
             configuration_settings=configuration_settings,
             configuration_protected_settings=configuration_protected_settings,
         )

src/k8s-extension/azext_k8s_extension/tests/latest/test_chaos_studio.py

@@ -405,12 +405,52 @@ def test_endpoint_mismatch_fails_before_writes(self):
             self.run_install()
         self.assertFalse(any(e[0] in ("create", "update", "arm-put") for e in self.events))
 
-    def test_old_or_unregistered_version_rejected_before_writes(self):
-        with self.assertRaises(InvalidArgumentValueError):
-            self.prepare(version="0.1.3")
-        self.versions.return_value = []
+    def registered(self, *versions):
+        self.versions.return_value = [SimpleNamespace(properties=SimpleNamespace(version=v)) for v in versions]
+
+    def test_unregistered_version_rejected_before_writes(self):
+        self.registered("0.1.6")
         with self.assertRaisesRegex(AzureResponseError, "not registered"):
-            self.run_install()
+            self.run_install(version="0.1.3")
+        self.assertFalse(any(e[0] in ("create", "update", "arm-put") for e in self.events))
+
+    def test_omitted_version_resolves_to_latest_registered(self):
+        self.registered("0.1.6", "0.2.10", "0.2.9", "not-a-version")
+        extension = self.prepare()
+        self.assertEqual(extension.version, "0.2.10")
+        self.assertFalse(extension.auto_upgrade_minor_version)
+        self.versions.assert_called_with("rg", "Microsoft.ContainerService", "managedClusters", "cluster",
+                                         "Microsoft.ChaosStudio", release_train="dev")
+        self.registered()
+        with self.assertRaisesRegex(InvalidArgumentValueError, "No Microsoft.ChaosStudio version"):
+            self.prepare()
+
+    def test_create_update_delete_at_registered_non_pinned_version(self):
+        self.registered("0.1.6", "0.2.0", "0.3.0")
+        result = self.run_install(version="0.2.0")
+        self.assertEqual(result.version, "0.2.0")
+        create = next(e[1] for e in self.events if e[0] == "create")
+        self.assertEqual(create.version, "0.2.0")
+        update = self.partner.Update(self.cmd, "rg", "cluster", None, None, None, "0.3.0",
+                                     {}, {}, self.client.extension)
+        self.assertEqual(update.version, "0.3.0")
+        update = self.partner.Update(self.cmd, "rg", "cluster", None, None, None, None,
+                                     {}, {}, self.client.extension)
+        self.assertEqual(update.version, "0.2.0")
+        self.events.clear()
+        with patch("azext_k8s_extension.partner_extensions.DefaultExtension.DefaultExtension.Delete"):
+            self.partner.Delete(self.cmd, self.client, "rg", "cluster", "chaos",
+                                "managedClusters", "Microsoft.ContainerService", True)
+        self.assertIn(("arm-delete", CONNECTION), [e[0:2] for e in self.events])
+
+    def test_resume_rejects_version_mismatch(self):
+        self.registered("0.2.0", "0.3.0")
+        self.client.fail_after_create = True
+        with self.assertRaises(AzureResponseError):
+            self.run_install(version="0.2.0")
+        self.events.clear()
+        with self.assertRaisesRegex(AzureResponseError, "version or state conflicts"):
+            self.run_install(version="0.3.0")
         self.assertFalse(any(e[0] in ("create", "update", "arm-put") for e in self.events))
 
     def test_customer_cannot_override_stage_identity_or_endpoint(self):

src/k8s-extension/setup.py

@@ -36,7 +36,7 @@
     "azure-mgmt-network>=18.0.0",
 ]
 
-VERSION = "1.9.1"
+VERSION = "1.9.2"
 
 with open("README.rst", "r", encoding="utf-8") as f:
     README = f.read()