diff --git a/tests/python_client/customize/milvus_operator.py b/tests/python_client/customize/milvus_operator.py index 48792a168d..d599eca06f 100644 --- a/tests/python_client/customize/milvus_operator.py +++ b/tests/python_client/customize/milvus_operator.py @@ -1,10 +1,11 @@ import json +import os import time from benedict import benedict from utils.util_log import test_log as log from common.cus_resource_opts import CustomResourceOperations as CusResource -template_yaml = 'template/default.yaml' +template_yaml = os.path.join(os.path.dirname(__file__), 'template/default.yaml') MILVUS_GRP = 'milvus.io' MILVUS_VER = 'v1alpha1' MILVUS_PLURAL = 'milvusclusters' @@ -31,7 +32,9 @@ class MilvusOperator(object): return None if template is None: - d_configs = benedict() + # d_configs = benedict() + log.debug(f'template yaml {template_yaml}') + d_configs = benedict.from_yaml(template_yaml) d_configs['apiVersion'] = f'{MILVUS_GRP}/{MILVUS_VER}' d_configs['kind'] = MILVUS_KIND else: diff --git a/tests/python_client/customize/template/default.yaml b/tests/python_client/customize/template/default.yaml index f67371142c..055a6f1cc5 100644 --- a/tests/python_client/customize/template/default.yaml +++ b/tests/python_client/customize/template/default.yaml @@ -14,6 +14,26 @@ spec: inCluster: deletionPolicy: Delete pvcDeletion: true + values: + image: + broker: + tag: 2.8.2 + zookeeper: + tag: 2.8.2 + bookkeeper: + tag: 2.8.2 + proxy: + tag: 2.8.2 + bastion: + tag: 2.8.2 + + zookeeper: + configData: + PULSAR_MEM: "\"-Xms1024m -Xmx1024m -Dcom.sun.management.jmxremote -Djute.maxbuffer=10485760DoEscapeAnalysis -XX:+DisableExplicitGC -XX:+PerfDisableSharedMem -Dzookeeper.forceSync=no\"" + + bookkeeper: + configData: + BOOKIE_MEM: "\"-Xms4096m -Xmx4096m -XX:MaxDirectMemorySize=8192m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -verbosegc\"" storage: inCluster: deletionPolicy: Delete