From 8ff0acc0e64ebe4387c9b4829c38a9e8d314e9e7 Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:03:40 +0800 Subject: [PATCH 1/8] Update release_dongtai.yml helm download dir --- .github/workflows/release_dongtai.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index db2eca7b..ec3893e5 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -148,10 +148,11 @@ jobs: - name: Download existed repo files run: | sed -i "s#tag: latest#tag: ${{ env.iast_version }}#g" deploy/kubernetes/helm/values.yaml + mkdir -p /home/runner/work/cos - name: Upload COS php uses: zkqiang/tencent-cos-action@v0.1.0 with: - args: download -rs iast/ ~/helm/repo/ --ignore "index.yaml" + args: download -rs iast/ /home/runner/work/cos --ignore "*.yaml" secret_id: ${{ secrets.TENSECRET_ID }} secret_key: ${{ secrets.TENSECRET_KEY }} bucket: dongtai-helm-charts-1251882848 @@ -159,16 +160,16 @@ jobs: - name: Create helm package run: | - ls ~/helm/repo - helm package deploy/kubernetes/helm -d ~/helm/repo --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} - ls ~/helm/repo - helm repo index ~/helm/repo/ --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} + ls /home/runner/work/cos + helm package deploy/kubernetes/helm -d /home/runner/work/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} + ls /home/runner/work/cos + helm repo index /home/runner/work/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} - name: Upload COS 2 uses: zkqiang/tencent-cos-action@v0.1.0 with: - args: upload -rs ~/helm/repo/dongtai-iast-${{ env.iast_version }}.tgz /iast/ && upload -rs ~/helm/repo/index.yaml /iast/ + args: upload -rs /home/runner/work/cos/dongtai-iast-${{ env.iast_version }}.tgz /iast/ && upload -rs /home/runner/work/cos/index.yaml /iast/ secret_id: ${{ secrets.TENSECRET_ID }} secret_key: ${{ secrets.TENSECRET_KEY }} bucket: dongtai-helm-charts-1251882848 From 4bd980d044194f2155ffd245802ae8f9ba2c7deb Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:02:21 +0800 Subject: [PATCH 2/8] Update release_dongtai.yml test download cos --- .github/workflows/release_dongtai.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index ec3893e5..0aee62d9 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -149,14 +149,25 @@ jobs: run: | sed -i "s#tag: latest#tag: ${{ env.iast_version }}#g" deploy/kubernetes/helm/values.yaml mkdir -p /home/runner/work/cos - - name: Upload COS php - uses: zkqiang/tencent-cos-action@v0.1.0 - with: - args: download -rs iast/ /home/runner/work/cos --ignore "*.yaml" - secret_id: ${{ secrets.TENSECRET_ID }} - secret_key: ${{ secrets.TENSECRET_KEY }} - bucket: dongtai-helm-charts-1251882848 - region: ap-hongkong +# - name: Upload COS php +# uses: zkqiang/tencent-cos-action@v0.1.0 +# with: +# args: download -rs iast/ /home/runner/work/cos --ignore "*.yaml" +# secret_id: ${{ secrets.TENSECRET_ID }} +# secret_key: ${{ secrets.TENSECRET_KEY }} +# bucket: dongtai-helm-charts-1251882848 +# region: ap-hongkong + - name: install deploy + run: sudo pip install coscmd + - name: 配置COS + env: + SECRET_ID: ${{ secrets.TENSECRET_ID }} + SECRET_KEY: ${{ secrets.TENSECRET_KEY }} + BUCKET: dongtai-helm-charts-1251882848 + REGION: ap-hongkong + run: | + coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION + coscmd download -rs iast/ /home/runner/work/cos --ignore "*.yaml" - name: Create helm package run: | From eeaad627ec0973be655e6f8036a23d4a38d84a2e Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:12:22 +0800 Subject: [PATCH 3/8] Update release_dongtai.yml cos dir --- .github/workflows/release_dongtai.yml | 41 ++++++++++----------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index 0aee62d9..6aff1c1f 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -148,39 +148,28 @@ jobs: - name: Download existed repo files run: | sed -i "s#tag: latest#tag: ${{ env.iast_version }}#g" deploy/kubernetes/helm/values.yaml - mkdir -p /home/runner/work/cos -# - name: Upload COS php -# uses: zkqiang/tencent-cos-action@v0.1.0 -# with: -# args: download -rs iast/ /home/runner/work/cos --ignore "*.yaml" -# secret_id: ${{ secrets.TENSECRET_ID }} -# secret_key: ${{ secrets.TENSECRET_KEY }} -# bucket: dongtai-helm-charts-1251882848 -# region: ap-hongkong - - name: install deploy - run: sudo pip install coscmd - - name: 配置COS - env: - SECRET_ID: ${{ secrets.TENSECRET_ID }} - SECRET_KEY: ${{ secrets.TENSECRET_KEY }} - BUCKET: dongtai-helm-charts-1251882848 - REGION: ap-hongkong - run: | - coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - coscmd download -rs iast/ /home/runner/work/cos --ignore "*.yaml" - + mkdir -p /github/workspace/cos + - name: Upload COS php + uses: zkqiang/tencent-cos-action@v0.1.0 + with: + args: download -rs iast/ /github/workspace/cos --ignore "*.yaml" + secret_id: ${{ secrets.TENSECRET_ID }} + secret_key: ${{ secrets.TENSECRET_KEY }} + bucket: dongtai-helm-charts-1251882848 + region: ap-hongkong + - name: Create helm package run: | - ls /home/runner/work/cos - helm package deploy/kubernetes/helm -d /home/runner/work/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} - ls /home/runner/work/cos - helm repo index /home/runner/work/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} + ls /github/workspace/cos + helm package deploy/kubernetes/helm -d /github/workspace/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} + ls /github/workspace/cos + helm repo index /github/workspace/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} - name: Upload COS 2 uses: zkqiang/tencent-cos-action@v0.1.0 with: - args: upload -rs /home/runner/work/cos/dongtai-iast-${{ env.iast_version }}.tgz /iast/ && upload -rs /home/runner/work/cos/index.yaml /iast/ + args: upload -rs /github/workspace/cos/dongtai-iast-${{ env.iast_version }}.tgz /iast/ && upload -rs /github/workspace/cos/index.yaml /iast/ secret_id: ${{ secrets.TENSECRET_ID }} secret_key: ${{ secrets.TENSECRET_KEY }} bucket: dongtai-helm-charts-1251882848 From 6314013e0e0f8e6a93f4099dbf6edbbbd2357cbc Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:17:49 +0800 Subject: [PATCH 4/8] Update release_dongtai.yml --- .github/workflows/release_dongtai.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index 6aff1c1f..29259c61 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -148,7 +148,7 @@ jobs: - name: Download existed repo files run: | sed -i "s#tag: latest#tag: ${{ env.iast_version }}#g" deploy/kubernetes/helm/values.yaml - mkdir -p /github/workspace/cos + - name: Upload COS php uses: zkqiang/tencent-cos-action@v0.1.0 with: From 17557273e925d4e1444a4a0937553846f5bed880 Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:25:39 +0800 Subject: [PATCH 5/8] Update release_dongtai.yml --- .github/workflows/release_dongtai.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index 29259c61..7ea5a046 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -160,10 +160,10 @@ jobs: - name: Create helm package run: | - ls /github/workspace/cos - helm package deploy/kubernetes/helm -d /github/workspace/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} - ls /github/workspace/cos - helm repo index /github/workspace/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} + ls /home/runner/work/DongTai/DongTai/cos + helm package deploy/kubernetes/helm -d /home/runner/work/DongTai/DongTai/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} + ls /home/runner/work/DongTai/DongTai/cos + helm repo index /home/runner/work/DongTai/DongTai/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} - name: Upload COS 2 From 2e287b5e419fe78e360629edd2964c314193e9ed Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:33:20 +0800 Subject: [PATCH 6/8] Update release_dongtai.yml --- .github/workflows/release_dongtai.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index 7ea5a046..4d63075b 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -160,9 +160,9 @@ jobs: - name: Create helm package run: | - ls /home/runner/work/DongTai/DongTai/cos - helm package deploy/kubernetes/helm -d /home/runner/work/DongTai/DongTai/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} - ls /home/runner/work/DongTai/DongTai/cos + ll -lh /home/runner/work/DongTai/DongTai/ + ll -lh /home/runner/work/DongTai/DongTai/cos + sudo helm package deploy/kubernetes/helm -d /home/runner/work/DongTai/DongTai/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} helm repo index /home/runner/work/DongTai/DongTai/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} From 7b40bed1f600c39e16d39695a3864a80889b70e0 Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:35:36 +0800 Subject: [PATCH 7/8] Update release_dongtai.yml --- .github/workflows/release_dongtai.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index 4d63075b..55119941 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -163,7 +163,7 @@ jobs: ll -lh /home/runner/work/DongTai/DongTai/ ll -lh /home/runner/work/DongTai/DongTai/cos sudo helm package deploy/kubernetes/helm -d /home/runner/work/DongTai/DongTai/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} - helm repo index /home/runner/work/DongTai/DongTai/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} + sudo helm repo index /home/runner/work/DongTai/DongTai/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }} - name: Upload COS 2 From 640fee3c5cb7a31d8ba7f05af56cb95ea23e9fb5 Mon Sep 17 00:00:00 2001 From: lingyuguo <30824318+lingyuguo@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:39:48 +0800 Subject: [PATCH 8/8] Update release_dongtai.yml --- .github/workflows/release_dongtai.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_dongtai.yml b/.github/workflows/release_dongtai.yml index 55119941..99baeda3 100644 --- a/.github/workflows/release_dongtai.yml +++ b/.github/workflows/release_dongtai.yml @@ -160,8 +160,8 @@ jobs: - name: Create helm package run: | - ll -lh /home/runner/work/DongTai/DongTai/ - ll -lh /home/runner/work/DongTai/DongTai/cos + ls -lh /home/runner/work/DongTai/DongTai/ + ls -lh /home/runner/work/DongTai/DongTai/cos sudo helm package deploy/kubernetes/helm -d /home/runner/work/DongTai/DongTai/cos --app-version ${{ env.iast_version }} --version ${{ env.iast_version }} sudo helm repo index /home/runner/work/DongTai/DongTai/cos --url ${{ secrets.DONGTAI_IAST_CHART_REPO_URL }}