[k8s-extension] Patch Bug in OpenServiceMesh with dependency on `pyhelm` #3602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

zhoxing-ms merged 124 commits into Azure:main from AzureArcForKubernetes:k8s-extension/release-0.5.1

Jul 9, 2021

src/k8s-extension/HISTORY.rst

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,10 @@ @@
     Release History
     ===============
+.5.1
+    ++++++++++++++++++
+    * Remove pyhelm dependency
 .5.0
     ++++++++++++++++++
     * Add microsoft.openservicemesh customization to check distros
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,8 +12,6 @@ @@
     from azure.cli.core.azclierror import InvalidArgumentValueError, RequiredArgumentMissingError
     from azure.cli.core.commands.client_factory import get_subscription_id
-    from pyhelm.chartbuilder import ChartBuilder
-    from pyhelm.repo import VersionError
     from packaging import version
     import yaml
@@ Expand Down Expand Up @@
             # NOTE-2: Return a valid ExtensionInstance object, Instance name and flag for Identity
             create_identity = False
-            _validate_tested_distro(cmd, resource_group_name, cluster_name, version)
+            # _validate_tested_distro(cmd, resource_group_name, cluster_name, version)
             extension_instance = ExtensionInstance(
                 extension_type=extension_type,
@@ Expand Down Expand Up @@
             pass
-    def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, extension_version):
+    # def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, extension_version):
-        field_unavailable_error = '\"testedDistros\" field unavailable for version {0} of microsoft.openservicemesh, ' \
-            'cannot determine if this Kubernetes distribution has been properly tested'.format(extension_version)
+    #     field_unavailable_error = '\"testedDistros\" field unavailable for version {0} of microsoft.openservicemesh, ' \
+    #         'cannot determine if this Kubernetes distribution has been properly tested'.format(extension_version)
-        if version.parse(str(extension_version)) <= version.parse("0.8.3"):
-            logger.warning(field_unavailable_error)
-            return
+    #     if version.parse(str(extension_version)) <= version.parse("0.8.3"):
+    #         logger.warning(field_unavailable_error)
+    #         return
-        subscription_id = get_subscription_id(cmd.cli_ctx)
-        resources = cf_resources(cmd.cli_ctx, subscription_id)
+    #     subscription_id = get_subscription_id(cmd.cli_ctx)
+    #     resources = cf_resources(cmd.cli_ctx, subscription_id)
-        cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Kubernetes' \
-            '/connectedClusters/{2}'.format(subscription_id, cluster_resource_group_name, cluster_name)
+    #     cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Kubernetes' \
+    #         '/connectedClusters/{2}'.format(subscription_id, cluster_resource_group_name, cluster_name)
-        resource = resources.get_by_id(cluster_resource_id, '2020-01-01-preview')
-        cluster_distro = resource.properties['distribution'].lower()
+    #     resource = resources.get_by_id(cluster_resource_id, '2020-01-01-preview')
+    #     cluster_distro = resource.properties['distribution'].lower()
-        if cluster_distro == "general":
-            logger.warning('Unable to determine if distro has been tested for microsoft.openservicemesh, '
-                           'kubernetes distro: \"general\"')
-            return
+    #     if cluster_distro == "general":
+    #         logger.warning('Unable to determine if distro has been tested for microsoft.openservicemesh, '
+    #                        'kubernetes distro: \"general\"')
+    #         return
-        tested_distros = _get_tested_distros(extension_version)
+    #     tested_distros = _get_tested_distros(extension_version)
-        if tested_distros is None:
-            logger.warning(field_unavailable_error)
-        elif cluster_distro not in tested_distros.split():
-            logger.warning('Untested kubernetes distro for microsoft.openservicemesh, Kubernetes distro is %s',
-                           cluster_distro)
+    #     if tested_distros is None:
+    #         logger.warning(field_unavailable_error)
+    #     elif cluster_distro not in tested_distros.split():
+    #         logger.warning('Untested kubernetes distro for microsoft.openservicemesh, Kubernetes distro is %s',
+    #                        cluster_distro)
-    def _get_tested_distros(chart_version):
+    # def _get_tested_distros(chart_version):
-        try:
-            chart_arc = ChartBuilder({
-                "name": OpenServiceMesh.CHART_NAME,
-                "version": str(chart_version),
-                "source": {
-                    "type": "repo",
-                    "location": OpenServiceMesh.CHART_LOCATION
-                }
-            })
-        except VersionError:
-            raise InvalidArgumentValueError(
-                "Invalid version '{}' for microsoft.openservicemesh".format(chart_version)
-            )
+    #     try:
+    #         chart_arc = ChartBuilder({
+    #             "name": OpenServiceMesh.CHART_NAME,
+    #             "version": str(chart_version),
+    #             "source": {
+    #                 "type": "repo",
+    #                 "location": OpenServiceMesh.CHART_LOCATION
+    #             }
+    #         })
+    #     except VersionError:
+    #         raise InvalidArgumentValueError(
+    #             "Invalid version '{}' for microsoft.openservicemesh".format(chart_version)
+    #         )
-        values = chart_arc.get_values()
-        values_yaml = yaml.load(values.raw, Loader=yaml.FullLoader)
+    #     values = chart_arc.get_values()
+    #     values_yaml = yaml.load(values.raw, Loader=yaml.FullLoader)
-        try:
-            return values_yaml['OpenServiceMesh']['testedDistros']
-        except KeyError:
-            return None
+    #     try:
+    #         return values_yaml['OpenServiceMesh']['testedDistros']
+    #     except KeyError:
+    #         return None

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,14 +9,15 @@ @@
     import unittest
     from azure.cli.core.azclierror import InvalidArgumentValueError
-    from azext_k8s_extension.partner_extensions.OpenServiceMesh import _get_tested_distros
+    # from azext_k8s_extension.partner_extensions.OpenServiceMesh import _get_tested_distros
     TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
     class TestOpenServiceMesh(unittest.TestCase):
         def test_bad_osm_arc_version(self):
-            version = "0.7.1"
-            err = "Invalid version \'" + str(version) + "\' for microsoft.openservicemesh"
-            with self.assertRaises(InvalidArgumentValueError) as argError:
-                _get_tested_distros(version)
-            self.assertEqual(str(argError.exception), err)
+            # version = "0.7.1"
+            # err = "Invalid version \'" + str(version) + "\' for microsoft.openservicemesh"
+            # with self.assertRaises(InvalidArgumentValueError) as argError:
+            #     _get_tested_distros(version)
+            # self.assertEqual(str(argError.exception), err)
+            pass

src/k8s-extension/setup.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ @@
         'pyhelm'
     ]
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
     with open('README.rst', 'r', encoding='utf-8') as f:
         README = f.read()
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[k8s-extension] Patch Bug in OpenServiceMesh with dependency on `pyhelm` #3602

Uh oh!

Diff view

Diff view

There are no files selected for viewing

zhoxing-ms Jul 9, 2021

Uh oh!

jonathan-innis Jul 9, 2021

Uh oh!

zhoxing-ms Jul 9, 2021

Uh oh!

[k8s-extension] Patch Bug in OpenServiceMesh with dependency on pyhelm #3602

Uh oh!

[k8s-extension] Patch Bug in OpenServiceMesh with dependency on pyhelm #3602

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

zhoxing-ms Jul 9, 2021

Choose a reason for hiding this comment

Uh oh!

jonathan-innis Jul 9, 2021

Choose a reason for hiding this comment

Uh oh!

zhoxing-ms Jul 9, 2021

Choose a reason for hiding this comment

Uh oh!

[k8s-extension] Patch Bug in OpenServiceMesh with dependency on `pyhelm` #3602

[k8s-extension] Patch Bug in OpenServiceMesh with dependency on `pyhelm` #3602