diff --git a/scripts/package_yuanrong.sh b/scripts/package_yuanrong.sh index a47b165a05dec9f1e7fa2abc3fa2d961c0997fef..b145cacfcb1894e10603374c1176749168b0a627 100644 --- a/scripts/package_yuanrong.sh +++ b/scripts/package_yuanrong.sh @@ -108,7 +108,7 @@ fi faas_filename=$(ls *faas*.tar.gz) if [ -n "${faas_filename}" ]; then tar -zxvf ${faas_filename} -C ${OUTPUT_DIR}/openyuanrong - cp -fr ${OUTPUT_DIR}/openyuanrong/pattern/pattern_faas/init_scheduler_args.json ${OUTPUT_DIR}/openyuanrong/function_system/config/ + cp -fr ${OUTPUT_DIR}/openyuanrong/pattern/pattern_faas/init_scheduler_args.json ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ fi dashboard_filename=$(ls *dashboard*.tar.gz) diff --git a/xx.json b/xx.json new file mode 100644 index 0000000000000000000000000000000000000000..63fa633c7eb8caa6f65d075a0ac707b6628d49c6 --- /dev/null +++ b/xx.json @@ -0,0 +1,74 @@ +{ + "name": "0@demo@faas", + "runtime": "python3.9", + "description": "this is my app", + "handler": "handler.my_handler", + "kind": "faas", + "cpu": 600, + "memory": 512, + "timeout": 600, + "customResources": {}, + "minInstance": "0", + "maxInstance": "100", + "concurrentNum": "100", + "storageType": "s3", + "codePath": "", + "s3CodePath": { + "bucketId": "demo", + "objectId": "index.zip", + "bucketUrl": "https://x.x.x.x:30110" + } + } + + { + "pools": [{ + "id": "pool3", + "size": 1, + "group": "rg1", + "reuse": true, + "labels": { + "label1": "val1" + }, + "environment": { + "key": "vaule" + }, + "volumes": "[]", + "volume_mounts": "[]", + "resources": { + "limits": { + "cpu": "600m", + "memory": "512Mi" + }, + "requests": { + "cpu": "600m", + "memory": "512Mi" + } + }, + "pod_anti_affinities": "" + }, + { + "id": "pool4", + "size": 1, + "group": "rg2", + "reuse": true, + "labels": { + "label1": "val1" + }, + "environment": { + "key": "vaule" + }, + "volumes": "[]", + "volume_mounts": "[]", + "resources": { + "limits": { + "cpu": "1000m", + "memory": "1024Mi" + }, + "requests": { + "cpu": "1000m", + "memory": "1024Mi" + } + }, + "pod_anti_affinities": "" + }] + } \ No newline at end of file