From c6a1516776def898342f6186a6947ae1d1acefd7 Mon Sep 17 00:00:00 2001
From: Jacky Jiang <t83714@gmail.com>
Date: Mon, 27 Apr 2020 11:38:44 +1000
Subject: [PATCH] - helm v3 chart - fixed helm chart indexing script

---
 .github/workflows/main.yml                    | 13 +++++---
 .github/workflows/release.yml                 | 33 +++++++++----------
 .../Chart.yaml                                |  3 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 954d98a..c85dc14 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,11 +18,14 @@ jobs:
       - run: yarn install
       - run: yarn build
       - run: yarn test
-      - name: helm-check
-        uses: igabaydulin/helm-check-action@0.1.4
-        env:
-          CHART_LOCATION: ./deploy/magda-project-open-data-connector
-          CHART_VALUES: ./deploy/test-deploy.yaml
+      
+      - name: Setup Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.2.0
+
+      - run: yarn helm-lint
+
       - name: Login to GitHub Package Repository
         env:
           GH_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b138089..f5b43d1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,11 +21,13 @@ jobs:
       - run: yarn install
       - run: yarn build
       - run: yarn test
-      - name: helm-check
-        uses: igabaydulin/helm-check-action@0.1.4
-        env:
-          CHART_LOCATION: ./deploy/magda-project-open-data-connector
-          CHART_VALUES: ./deploy/test-deploy.yaml
+      
+      - name: Setup Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.2.0
+
+      - run: yarn helm-lint
 
       - name: Login to GitHub Package Repository
         env:
@@ -48,11 +50,6 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-      - name: Setup Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v2.16.1
-
       - name: Setup AWS CLi Tools
         uses: chrislennon/action-aws-cli@v1.1
 
@@ -62,10 +59,12 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
-          echo "Sync with existing charts repo in s3..."
-          mkdir -p chart-repo
-          aws s3 sync s3://magda-charts/ chart-repo
-          helm package ./deploy/${REPO_NAME} -d chart-repo --save=false
-          helm repo index chart-repo
-          echo "Releasing charts to s3..."
-          aws s3 sync chart-repo s3://magda-charts/ --acl public-read
+          cd deploy
+          mkdir -p sync_dir
+          mkdir -p index_dir
+          if ! aws s3 cp s3://magda-charts/index.yaml index_dir/index.yaml; then echo "failed to copy current repo index" && exit 1; fi
+          helm package -d sync_dir ${REPO_NAME}
+          helm repo index --merge "index_dir/index.yaml" sync_dir
+          mv -f sync_dir/index.yaml index_dir/index.yaml
+          aws s3 sync sync_dir s3://magda-charts/ --acl public-read
+          aws s3 cp index_dir/index.yaml s3://magda-charts/index.yaml --acl public-read
diff --git a/deploy/magda-project-open-data-connector/Chart.yaml b/deploy/magda-project-open-data-connector/Chart.yaml
index f5e3422..3681419 100644
--- a/deploy/magda-project-open-data-connector/Chart.yaml
+++ b/deploy/magda-project-open-data-connector/Chart.yaml
@@ -1,6 +1,7 @@
-apiVersion: v1
+apiVersion: v2
 name: magda-project-open-data-connector
 description: A Helm chart for Magda Project Open Data Connector
 version: "0.0.57-0"
+kubeVersion: ">= 1.14.0-0"
 home: "https://github.com/magda-io/magda-project-open-data-connector"
 sources: ["https://github.com/magda-io/magda-project-open-data-connector"]