From 26fde54b5b12452b21b8b6de777efaebf5804bcc Mon Sep 17 00:00:00 2001
From: mytting <jianchang@yunshan.net>
Date: Mon, 10 Apr 2023 18:46:47 +0800
Subject: [PATCH] update v6.1

---
 .github/workflows/release-chart.yml | 17 ++++++++---------
 charts/deepflow-agent/.helmignore   |  1 +
 charts/deepflow-agent/values.yaml   |  2 +-
 charts/deepflow/values.yaml         |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml
index cb7c99e..4762f21 100644
--- a/.github/workflows/release-chart.yml
+++ b/.github/workflows/release-chart.yml
@@ -76,20 +76,19 @@ jobs:
       - name: upload chart index
         run: |
           ossutil cp -rf .cr-release-packages/index.yaml oss://deepflow-ce/chart/stable/
-          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.1.8.tgz oss://deepflow-ce/chart/latest/
+          ossutil cp -rf .cr-release-packages/deepflow-agent-6.1.8.tgz oss://deepflow-ce/chart/latest/
             
       - name: push to deepflow repo
         run: |
-          rm -rf index.current
-          rm -rf cr-release-packages/index.yaml
-          curl -o index.current https://deepflowio.github.io/deepflow/index.yaml||true
+          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.1.8/ --merge index.current
-          helm repo index .cr-release-packages-agent/ --url https://github.com/deepflowio/deepflow-charts/releases/download/deepflow-agent-6.1.8/ --merge .cr-release-packages/index.yaml
+          helm repo index .cr-release-packages/ --url https://github.com/deepflowio/deepflow-charts/releases/download/deepflow-6.1.8/ --merge  deepflow/index.yaml
+          helm repo index .cr-release-packages-agent/ --url https://github.com/deepflowio/deepflow-charts/releases/download/deepflow-agent-6.1.8/ --merge deepflow/index.yaml
+          rm -rf deepflow
           gh repo clone deepflowio/deepflow
           cd deepflow/
           git checkout -b gh-pages origin/gh-pages
diff --git a/charts/deepflow-agent/.helmignore b/charts/deepflow-agent/.helmignore
index 0e8a0eb..37f9222 100644
--- a/charts/deepflow-agent/.helmignore
+++ b/charts/deepflow-agent/.helmignore
@@ -17,6 +17,7 @@
 *.orig
 *~
 # Various IDEs
+# 
 .project
 .idea/
 *.tmproj
diff --git a/charts/deepflow-agent/values.yaml b/charts/deepflow-agent/values.yaml
index dff5293..da22b73 100644
--- a/charts/deepflow-agent/values.yaml
+++ b/charts/deepflow-agent/values.yaml
@@ -14,7 +14,7 @@ image:
   repository: deepflowce/deepflow-agent
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v6.1.8.8
+  tag: v6.1.8.9
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/charts/deepflow/values.yaml b/charts/deepflow/values.yaml
index e723ff4..daa8f13 100644
--- a/charts/deepflow/values.yaml
+++ b/charts/deepflow/values.yaml
@@ -67,7 +67,7 @@ global:
 image:
   server:
     repository: "{{ .Values.global.image.repository }}/deepflow-server"
-    tag: v6.1.8.8
+    tag: v6.1.8.9
     pullPolicy: "{{ .Values.global.image.pullPolicy }}"
   app:
     repository:  "{{ .Values.global.image.repository }}/deepflow-app"