From 9039fe2daae5c675db551d5d772a489f54863967 Mon Sep 17 00:00:00 2001 From: jagger Date: Wed, 24 Jan 2024 09:56:49 +0800 Subject: [PATCH] fix: ci/cd bug Closes #10 Signed-off-by: jagger Former-commit-id: d47ff7976541a396699a31066e8d753386a63904 --- .devops/api.yml | 12 ++---------- .devops/rpc.yml | 12 ++---------- api/etc/pcm.yaml | 10 +++++----- api/pcm-coordinator-api.yaml | 4 ---- rpc/pcm-coordinator-rpc.yaml | 4 ---- 5 files changed, 9 insertions(+), 33 deletions(-) diff --git a/.devops/api.yml b/.devops/api.yml index d8bcc618..ecf4f08a 100644 --- a/.devops/api.yml +++ b/.devops/api.yml @@ -10,12 +10,6 @@ global: required: false type: STRING hidden: false - - ref: nacos_host - name: nacos_host - value: '"10.206.0.12"' - required: false - type: STRING - hidden: false - ref: secret_name name: "" value: '"jcce-aliyuncs"' @@ -45,8 +39,8 @@ workflow: name: git clone task: git_clone@1.2.6 input: - remote_url: '"https://gitlink.org.cn/jcce-pcm/pcm-coordinator.git"' - ref: '"refs/heads/JCOS"' + remote_url: '"https://gitlink.org.cn/JointCloud/pcm-coordinator.git"' + ref: '"refs/heads/master"' commit_id: '""' depth: 1 needs: @@ -93,14 +87,12 @@ workflow: IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-coordinator-api"' IMAGE_TAG: git_clone_0.commit_time SECRET_NAME: global.secret_name - NACOS_HOST: global.nacos_host PROJECT_NAME: global.project_name PROJECT_PATH: git_clone_0.git_path script: - cd ${PROJECT_PATH}/api - sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml - sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml - - sed -i "s#nacos_host#${NACOS_HOST}#" ${PROJECT_NAME}.yaml - cat ${PROJECT_NAME}.yaml needs: - git_clone_0 diff --git a/.devops/rpc.yml b/.devops/rpc.yml index 2881c8e2..f95e1bbc 100644 --- a/.devops/rpc.yml +++ b/.devops/rpc.yml @@ -10,12 +10,6 @@ global: required: false type: STRING hidden: false - - ref: nacos_host - name: nacos_host - value: '"10.206.0.12"' - required: false - type: STRING - hidden: false - ref: secret_name name: "" value: '"jcce-aliyuncs"' @@ -45,8 +39,8 @@ workflow: name: git clone task: git_clone@1.2.6 input: - remote_url: '"https://gitlink.org.cn/jcce-pcm/pcm-coordinator.git"' - ref: '"refs/heads/JCOS"' + remote_url: '"https://gitlink.org.cn/JointCloud/pcm-coordinator.git"' + ref: '"refs/heads/master"' commit_id: '""' depth: 1 needs: @@ -93,14 +87,12 @@ workflow: IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-coordinator-rpc"' IMAGE_TAG: git_clone_0.commit_time SECRET_NAME: global.secret_name - NACOS_HOST: global.nacos_host PROJECT_NAME: global.project_name PROJECT_PATH: git_clone_0.git_path script: - cd ${PROJECT_PATH}/rpc - sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml - sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml - - sed -i "s#nacos_host#${NACOS_HOST}#" ${PROJECT_NAME}.yaml - cat ${PROJECT_NAME}.yaml needs: - git_clone_0 diff --git a/api/etc/pcm.yaml b/api/etc/pcm.yaml index a8ff97f9..11d07339 100644 --- a/api/etc/pcm.yaml +++ b/api/etc/pcm.yaml @@ -5,7 +5,7 @@ Port: 8999 Timeout: 50000 DB: - DataSource: root:uJpLd6u-J?HC1@(119.45.100.73:3306)/pcm?parseTime=true&loc=Local + DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true&loc=Local Redis: Host: 10.206.0.12:6379 @@ -19,7 +19,7 @@ Cache: K8sNativeConf: # target: nacos://10.206.0.12:8848/pcm.kubenative.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api Endpoints: - - pcm-participant-kubernetes-service:2003 + - 127.0.0.1:2003 NonBlock: true #rpc @@ -53,9 +53,9 @@ ACRpcConf: #rpc CephRpcConf: - target: nacos://10.206.0.12:8848/pcm.ceph.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api - # Endpoints: - # - 127.0.0.1:8888 + # target: nacos://10.206.0.12:8848/pcm.ceph.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + Endpoints: + - pcm-participant-ceph-service:2008 NonBlock: true Timeout: 50000 diff --git a/api/pcm-coordinator-api.yaml b/api/pcm-coordinator-api.yaml index 7c5d835d..7cfcedbc 100644 --- a/api/pcm-coordinator-api.yaml +++ b/api/pcm-coordinator-api.yaml @@ -16,10 +16,6 @@ spec: labels: k8s-app: pcm-coordinator-api spec: - hostAliases: - - hostnames: - - nacos.jcce.dev - ip: nacos_host imagePullSecrets: - name: secret_name containers: diff --git a/rpc/pcm-coordinator-rpc.yaml b/rpc/pcm-coordinator-rpc.yaml index bd853bb6..769467d3 100644 --- a/rpc/pcm-coordinator-rpc.yaml +++ b/rpc/pcm-coordinator-rpc.yaml @@ -16,10 +16,6 @@ spec: labels: k8s-app: pcm-coordinator-rpc spec: - hostAliases: - - hostnames: - - nacos.jcce.dev - ip: nacos_host imagePullSecrets: - name: secret_name containers: