diff --git a/scripts/envoy_config.py b/scripts/envoy_config.py index e90050c..a9b4284 100644 --- a/scripts/envoy_config.py +++ b/scripts/envoy_config.py @@ -25,7 +25,7 @@ def deploy(self, namespace, enable_envoy_admin): else: process = "upgrade" - command = "helm {0} --timeout 180s {1} {2} --namespace {3} --set envoyAdmin.enabled='{4}'".format(process, self.release_name, + command = "helm3 {0} --timeout 180s {1} {2} --namespace {3} --set envoyAdmin.enabled='{4}'".format(process, self.release_name, self.helm_chart_path, namespace, enable_envoy_admin) cmd_runner(command, "Envoy") diff --git a/scripts/language_config.py b/scripts/language_config.py index b6e966d..c6863d2 100644 --- a/scripts/language_config.py +++ b/scripts/language_config.py @@ -51,7 +51,7 @@ def deploy(self, namespace, api_changed, gpu_count, enable_gpu, cpu_count, image if is_deployed == True: process = "upgrade" if api_changed == True: - uninstall_command = "helm uninstall {0} --namespace {1}".format(self.release_name, + uninstall_command = "helm3 uninstall {0} --namespace {1}".format(self.release_name, namespace) cmd_runner(uninstall_command, "LANGUAGE :" + self.language_code) process = "install" @@ -60,7 +60,7 @@ def deploy(self, namespace, api_changed, gpu_count, enable_gpu, cpu_count, image pull_policy = "Always" if api_changed == True else "IfNotPresent" - command = "helm {0} --timeout 180s {1} {2} --namespace {3} --set env.languages='[\"{4}\"]' --set " \ + command = "helm3 {0} --timeout 180s {1} {2} --namespace {3} --set env.languages='[\"{4}\"]' --set " \ "image.pullPolicy='{5}' --set image.repository='{6}' --set image.tag='{7}'".format( process, self.release_name, self.helm_chart_path, namespace, self.language_code, pull_policy, image_name, @@ -83,7 +83,7 @@ def __init__(self, language_code_list, base_name, helm_chart_path): print("Release name", self.release_name) def is_deployed(self, namespace): - result = subprocess.getoutput('helm status {} -n {} --output yaml'.format(self.release_name, namespace)) + result = subprocess.getoutput('helm3 status {} -n {} --output yaml'.format(self.release_name, namespace)) if "release: not found" in result.lower(): return False else: @@ -105,7 +105,7 @@ def deploy(self, namespace, api_changed, gpu_count, enable_gpu, cpu_count, image if is_deployed == True: process = "upgrade" if api_changed == True: - uninstall_command = "helm uninstall {0} --namespace {1}".format(self.release_name, namespace) + uninstall_command = "helm3 uninstall {0} --namespace {1}".format(self.release_name, namespace) cmd_runner(uninstall_command, "LANGUAGE :" + ",".join(self.language_code_list)) process = "install" else: @@ -115,7 +115,7 @@ def deploy(self, namespace, api_changed, gpu_count, enable_gpu, cpu_count, image languages = ["\"{}\"".format(x) for x in self.language_code_list] languages = "\,".join(languages) - command = "helm {0} --timeout 180s {1} {2} --namespace {3} --set env.languages='[{4}]' --set " \ + command = "helm3 {0} --timeout 180s {1} {2} --namespace {3} --set env.languages='[{4}]' --set " \ "image.pullPolicy='{5}' --set image.repository='{6}' --set image.tag='{7}'".format( process, self.release_name, self.helm_chart_path, namespace, languages, pull_policy, image_name, image_version)