Delete scale default helm chart path (#7829)

Signed-off-by: ThreadDao <yufen.zong@zilliz.com>
This commit is contained in:
ThreadDao 2021-09-13 19:38:58 +08:00 committed by GitHub
parent 7c0d4996f6
commit d456f0c677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions

View File

@ -11,5 +11,4 @@ QUERY_NODE = "queryNode"
# my values.yaml path # my values.yaml path
MILVUS_CHART_ENV = 'MILVUS_CHART_ENV' MILVUS_CHART_ENV = 'MILVUS_CHART_ENV'
MILVUS_CHART_PATH = '/home/zong/milvus-helm/charts/milvus'
MILVUS_LOGS_PATH = '/tmp/milvus' MILVUS_LOGS_PATH = '/tmp/milvus'

View File

@ -8,6 +8,7 @@ from scale import scale_common as sc
class HelmEnv: class HelmEnv:
milvus_chart_path = sc.get_milvus_chart_env_var()
def __init__(self, release_name=None, **kwargs): def __init__(self, release_name=None, **kwargs):
self.release_name = release_name if release_name else cf.gen_unique_str("scale") self.release_name = release_name if release_name else cf.gen_unique_str("scale")
@ -15,7 +16,6 @@ class HelmEnv:
self.data_node = kwargs.get(constants.DATA_NODE, 1) self.data_node = kwargs.get(constants.DATA_NODE, 1)
self.index_node = kwargs.get(constants.INDEX_NODE, 1) self.index_node = kwargs.get(constants.INDEX_NODE, 1)
self.query_node = kwargs.get(constants.QUERY_NODE, 1) self.query_node = kwargs.get(constants.QUERY_NODE, 1)
self.milvus_chart_path = sc.get_milvus_chart_env_var()
def helm_install_cluster_milvus(self, image_pull_policy=constants.IF_NOT_PRESENT): def helm_install_cluster_milvus(self, image_pull_policy=constants.IF_NOT_PRESENT):
""" """

View File

@ -15,12 +15,14 @@ def get_milvus_chart_env_var(var=constants.MILVUS_CHART_ENV):
milvus_helm_chart = os.environ[var] milvus_helm_chart = os.environ[var]
return str(milvus_helm_chart) return str(milvus_helm_chart)
except Exception as e: except Exception as e:
milvus_helm_chart = constants.MILVUS_CHART_PATH log.error(f'Failed to get environment variables {var}, with exception {str(e)}')
log.warning( # milvus_helm_chart = constants.MILVUS_CHART_PATH
f"Failed to get environment variables: {var}, use default: {constants.MILVUS_CHART_PATH}, {str(e)}") # log.error(f'Failed to get environment variables {var}, please set.')
if not os.path.exists(milvus_helm_chart): # log.warning(
raise Exception(f'milvus_helm_chart: {milvus_helm_chart} not exist') # f"Failed to get environment variables: {var}, use default: {constants.MILVUS_CHART_PATH}, {str(e)}")
return milvus_helm_chart # if not os.path.exists(milvus_helm_chart):
# raise Exception(f'milvus_helm_chart: {milvus_helm_chart} not exist')
# return milvus_helm_chart
def e2e_milvus(host, c_name, collection_exist=False): def e2e_milvus(host, c_name, collection_exist=False):