update v6.4.9

deepflowio · Mar 20, 2024 · 13f9142 · 13f9142
1 parent 38e2495
commit 13f9142
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 114 deletions.
diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml
@@ -3,8 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - main
-      - 'feature-**'
+      - v6.4
     paths:
       - 'charts/**'
     tags:
@@ -24,6 +23,22 @@ jobs:
     runs-on: ubuntu-latest
     if: "!startsWith(github.ref, 'refs/tags/')"
     steps:
+      - uses: dev-drprasad/[email protected]
+        with:
+          delete_release: true # default: true
+          delete_draft_release: true # default: false; only applicable if delete_release == true
+          tag_name: deepflow-agent-6.4.9
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: dev-drprasad/[email protected]
+        with:
+          delete_release: true # default: true
+          delete_draft_release: true # default: false; only applicable if delete_release == true
+          tag_name: deepflow-6.4.9
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -32,12 +47,10 @@ jobs:
       - name: Copy DeepFlow Agent chart
         run: |
           cp -rf charts/deepflow-agent charts/deepflow/charts/
-
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "[email protected]"
-
       - name: Install Helm
         uses: azure/setup-helm@v1
         with:
@@ -50,7 +63,8 @@ jobs:
 
       - name: helm index
         run: |
-          curl -o index.current https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/latest/index.yaml||true
+          rm -rf index.current
+          curl -o index.current https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stable/index.yaml
           helm repo index .cr-release-packages/ --url https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/latest/ --merge index.current
 
       - uses: manyuanrong/[email protected]
@@ -61,11 +75,31 @@ jobs:
 
       - name: upload chart index
         run: |
-          ossutil cp -rf .cr-release-packages/index.yaml oss://deepflow-ce/chart/latest/
-          for file in $(ls  .cr-release-packages/deepflow-*.tgz)
-            do 
-               ossutil cp -rf $file oss://deepflow-ce/chart/latest/
-            done
+          ossutil cp -rf .cr-release-packages/index.yaml oss://deepflow-ce/chart/stable/
+          ossutil cp -rf .cr-release-packages/deepflow-6.4.9.tgz oss://deepflow-ce/chart/latest/
+          ossutil cp -rf .cr-release-packages/deepflow-agent-6.4.9.tgz oss://deepflow-ce/chart/latest/
+            
+      - name: push to deepflow repo
+        run: |
+          git clone https://github.com/deepflowio/deepflow.git -b gh-pages
+          mkdir -p .cr-release-packages-agent
+          mkdir -p  .cr-release-packages
+          mv .cr-release-packages/deepflow-agent*.tgz .cr-release-packages-agent/
+          helm repo index .cr-release-packages/ --url https://github.com/deepflowio/deepflow-charts/releases/download/deepflow-6.4.9/ --merge  deepflow/index.yaml
+          helm repo index .cr-release-packages-agent/ --url https://github.com/deepflowio/deepflow-charts/releases/download/deepflow-agent-6.4.9/ --merge .cr-release-packages/index.yaml
+          rm -rf deepflow
+          gh repo clone deepflowio/deepflow
+          cd deepflow/
+          git checkout -b gh-pages origin/gh-pages
+          cp -raf ../.cr-release-packages-agent/index.yaml ./index.yaml
+          git config --global user.name "action"
+          git config --global user.email "[email protected]"
+          git remote set-url --push origin https://action:${{ secrets.PUSH_SECRET }}@github.com/deepflowio/deepflow/
+          git add ./index.yaml
+          git commit -am "update charts"
+          git push 
+        env:
+          GH_TOKEN: ${{ secrets.PUSH_SECRET }}
 
   sync_image:
     name: sync image
@@ -138,14 +172,13 @@ jobs:
 
       - name: install deepflow 
         run: |
-          helm upgrade --install deepflow -n deepflow deepflow/deepflow --create-namespace \
+          helm upgrade --install deepflow -n deepflow deepflow/deepflow --create-namespace --version 6.4.9 \
               -f test-values.yaml
 
       - name: install skopeo
         run: |
           sudo apt-get update
           sudo apt-get -y install skopeo
-          skopeo --version
 
       - name: sync image
         run: |
@@ -158,102 +191,8 @@ jobs:
               echo "skopeo copy -a  docker://$SYNCIMAGE docker://registry.cn-beijing.aliyuncs.com/deepflow-ce/$SORTIMAGE"
               echo "skopeo copy -a  docker://$SYNCIMAGE docker://registry.cn-hongkong.aliyuncs.com/deepflow-ce/$SORTIMAGE"
               echo "skopeo copy -a  docker://$SYNCIMAGE docker://ghcr.io/deepflowio/deepflow-ce/$SORTIMAGE "
-              docker run -v ~/.docker/config.json:/tmp/auth.json quay.io/skopeo/stable:latest copy -a  docker://$SYNCIMAGE docker://deepflowce/$SORTIMAGE
-              docker run -v ~/.docker/config.json:/tmp/auth.json quay.io/skopeo/stable:latest copy -a  docker://$SYNCIMAGE docker://registry.cn-beijing.aliyuncs.com/deepflow-ce/$SORTIMAGE
-              docker run -v ~/.docker/config.json:/tmp/auth.json quay.io/skopeo/stable:latest copy -a  docker://$SYNCIMAGE docker://registry.cn-hongkong.aliyuncs.com/deepflow-ce/$SORTIMAGE       
-              docker run -v ~/.docker/config.json:/tmp/auth.json quay.io/skopeo/stable:latest copy -a  docker://$SYNCIMAGE docker://ghcr.io/deepflowio/deepflow-ce/$SORTIMAGE 
-            done
-
-  release_stable_chart:
-    name: release stable chart
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')  #### to stable
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: 'gh-pages'
-      - name: push to deepflow repo
-        run: |
-          gh repo clone deepflowio/deepflow
-          cd deepflow/
-          git checkout -b gh-pages origin/gh-pages
-          cp -raf ../index.yaml ./index.yaml
-          git config --global user.name "action"
-          git config --global user.email "[email protected]"
-          git remote set-url --push origin https://action:${{ secrets.PUSH_SECRET }}@github.com/deepflowio/deepflow
-          git add index.yaml
-          git commit -am "update charts"
-          git push 
-        env:
-          GH_TOKEN: ${{ secrets.PUSH_SECRET }}
-
-      - uses: manyuanrong/[email protected]
-        with:
-          endpoint: "oss-accelerate.aliyuncs.com"
-          access-key-id: "${{ secrets.ALIYUN_OSS_ACCESS_KEY }}"
-          access-key-secret: "${{ secrets.ALIYUN_OSS_SECRETS_KEY }}"
-
-      - name: upload chart index
-        run: |
-          ossutil cp -rf  oss://deepflow-ce/chart/latest/index.yaml oss://deepflow-ce/chart/stable/
-
-      - name: build sealos cluster image
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          issue-number: 78
-          repository: labring/cluster-image
-          body: |
-            /imagebuild_apps deepflow stable
-          token: "${{ secrets.PUSH_SECRET }}"
-
-      - name: build sealos cluster image
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          issue-number: 78
-          repository: labring/cluster-image
-          body: |
-            /imagebuild_apps deepflow ${{ github.ref_name }}
-          token: "${{ secrets.PUSH_SECRET }}"
-
-      - name: build kubesphere helm repo
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          issue-number: 266
-          repository: kubesphere/helm-charts
-          body: |
-            /build-latest-app
-          token: "${{ secrets.PUSH_SECRET }}"
-
-      - name: Invoke workflow in another repo with inputs
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Release Charts
-          repo: deepflowio/deepflow-charts
-          token: ${{ secrets.PUSH_SECRET }}
-          ref: 'v6.1'
-          inputs: '{ "ref": "Release"}'
-
-      - name: Install k8s
-        run: |
-          sleep 30
-      - name: Invoke workflow in another repo with inputs
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Release Charts
-          repo: deepflowio/deepflow-charts
-          token: ${{ secrets.PUSH_SECRET }}
-          ref: 'v6.2'
-          inputs: '{ "ref": "Release"}'
-      - name: Install k8s
-        run: |
-          sleep 30
-      - name: Invoke workflow in another repo with inputs
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Release Charts
-          repo: deepflowio/deepflow-charts
-          token: ${{ secrets.PUSH_SECRET }}
-          ref: 'v6.3'
-          inputs: '{ "ref": "Release"}'
+              skopeo copy -a  docker://$SYNCIMAGE docker://deepflowce/$SORTIMAGE
+              skopeo copy -a  docker://$SYNCIMAGE docker://registry.cn-beijing.aliyuncs.com/deepflow-ce/$SORTIMAGE
+              skopeo copy -a  docker://$SYNCIMAGE docker://registry.cn-hongkong.aliyuncs.com/deepflow-ce/$SORTIMAGE       
+              skopeo copy -a  docker://$SYNCIMAGE docker://ghcr.io/deepflowio/deepflow-ce/$SORTIMAGE 
+            done
diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml
@@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow-agent
 engine: gotpl
 type: application
-version: 6.4.012
+version: 6.4.9
 appVersion: "6.4.9"
 kubeVersion: ">=1.16.0-0"
 sources:

diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml
@@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow
 engine: gotpl
 type: application
-version: 6.4.012
+version: 6.4.9
 appVersion: "6.4.9"
 kubeVersion: ">=1.16.0-0"
 sources:

diff --git a/test-values.yaml b/test-values.yaml
@@ -9,4 +9,5 @@ clickhouse:
 grafana:
   image:
     registry: docker.io
-    repository: grafana/grafana
+    repository: grafana/grafana
+  assertNoLeakedSecrets: false