Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …

…into k8s-extension/public
AzureArcForKubernetes · Jul 9, 2021 · 5bfabdb · 5bfabdb
2 parents 0336667 + 5e25dcf
commit 5bfabdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/connectedk8s/azext_connectedk8s/custom.py b/src/connectedk8s/azext_connectedk8s/custom.py
@@ -790,7 +790,7 @@ def update_agents(cmd, client, resource_group_name, cluster_name, https_proxy=""
     if "3.3.0-rc" in helm_version:
         raise ClientRequestError("The current helm version is not supported for azure-arc onboarding. Please upgrade helm to a stable version and try again.")
 
-    validate_release_namespace(client, cluster_name, resource_group_name, configuration, kube_config, kube_context)
+    release_namespace = validate_release_namespace(client, cluster_name, resource_group_name, configuration, kube_config, kube_context)
 
     # Fetch Connected Cluster for agent version
     connected_cluster = get_connectedk8s(cmd, client, resource_group_name, cluster_name)
@@ -835,7 +835,7 @@ def update_agents(cmd, client, resource_group_name, cluster_name, https_proxy=""
     # Get Helm chart path
     chart_path = utils.get_chart_path(registry_path, kube_config, kube_context)
 
-    cmd_helm_upgrade = ["helm", "upgrade", "azure-arc", chart_path,
+    cmd_helm_upgrade = ["helm", "upgrade", "azure-arc", chart_path, "--namespace", release_namespace,
                         "--reuse-values",
                         "--wait", "--output", "json"]
     if values_file_provided:
@@ -1194,7 +1194,7 @@ def enable_features(cmd, client, resource_group_name, cluster_name, features, ku
     if "3.3.0-rc" in helm_version:
         raise ClientRequestError("The current helm version is not supported for azure-arc onboarding. Please upgrade helm to a stable version and try again.")
 
-    validate_release_namespace(client, cluster_name, resource_group_name, configuration, kube_config, kube_context)
+    release_namespace = validate_release_namespace(client, cluster_name, resource_group_name, configuration, kube_config, kube_context)
 
     # Fetch Connected Cluster for agent version
     connected_cluster = get_connectedk8s(cmd, client, resource_group_name, cluster_name)
@@ -1239,7 +1239,7 @@ def enable_features(cmd, client, resource_group_name, cluster_name, features, ku
     # Get Helm chart path
     chart_path = utils.get_chart_path(registry_path, kube_config, kube_context)
 
-    cmd_helm_upgrade = ["helm", "upgrade", "azure-arc", chart_path,
+    cmd_helm_upgrade = ["helm", "upgrade", "azure-arc", chart_path, "--namespace", release_namespace,
                         "--reuse-values",
                         "--wait", "--output", "json"]
     if values_file_provided:
@@ -1380,7 +1380,7 @@ def disable_features(cmd, client, resource_group_name, cluster_name, features, k
     # Get Helm chart path
     chart_path = utils.get_chart_path(registry_path, kube_config, kube_context)
 
-    cmd_helm_upgrade = ["helm", "upgrade", "azure-arc", chart_path,
+    cmd_helm_upgrade = ["helm", "upgrade", "azure-arc", chart_path, "--namespace", release_namespace,
                         "--reuse-values",
                         "--wait", "--output", "json"]
     if values_file_provided:

diff --git a/src/index.json b/src/index.json
@@ -12775,22 +12775,14 @@
                             }
                         }
                     },
-                    "extras": [],
                     "generator": "bdist_wheel (0.30.0)",
                     "license": "MIT",
                     "metadata_version": "2.0",
                     "name": "k8s-extension",
-                    "run_requires": [
-                        {
-                            "requires": [
-                                "pyhelm"
-                            ]
-                        }
-                    ],
                     "summary": "Microsoft Azure Command-Line Tools K8s-extension Extension",
                     "version": "0.5.1"
                 },
-                "sha256Digest": "da636a38097d8e1e83494afc784f26ffcc0d962e08e8bb6f202b3fc23e291309"
+                "sha256Digest": "b04378d1c1699cf8cf37fc84a0f77fd5b87c653cc4d06049ba546660ce57fe42"
             }
         ],
         "k8sconfiguration": [