From 98d0a3c7fffd6f91a8a1319d20cff55981e92676 Mon Sep 17 00:00:00 2001
From: Prudhvi Godithi <pgodithi@amazon.com>
Date: Tue, 5 Nov 2024 06:32:37 -0800
Subject: [PATCH] 2.6.2 release

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
---
 .github/workflows/helm-release.yaml  | 13 ++++++++-----
 .github/workflows/release.yaml       | 17 ++++++++++++++---
 charts/opensearch-cluster/Chart.yaml |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index d8a2304f..a152f12f 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -8,10 +8,12 @@ on:
 
 jobs:
   release:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -21,13 +23,14 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.14.3
+        uses: azure/setup-helm@v4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run chart-releaser for opensearch-cluster
         uses: helm/chart-releaser-action@v1.6.0
         with:
-          charts_dir: charts/opensearch-cluster
+          skip_existing: true
+          mark_as_latest: false
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 20397015..16aaac02 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,13 +12,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+ 
       - name: Setup go
         uses: actions/setup-go@v5
         with:
           go-version-file: 'go.work'
           cache: false
+ 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
       - name: set Env
         id: github-ver
         run: |
@@ -29,15 +34,21 @@ jobs:
           sed -i -e 's/^appVersion:.*/appVersion: '$RELEASE_VERSION'/' charts/opensearch-operator/Chart.yaml
           sed -i -e 's/^version:.*/version: '$RELEASE_VERSION'/' charts/opensearch-operator/Chart.yaml
 
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
       - name: Install Helm
         uses: azure/setup-helm@v4
-        with:
-          version: v3.14.3
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run chart-releaser for opensearch-operator
         uses: helm/chart-releaser-action@v1.6.0
         with:
-          charts_dir: charts/opensearch-operator
+          skip_existing: true
+          mark_as_latest: false
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/charts/opensearch-cluster/Chart.yaml b/charts/opensearch-cluster/Chart.yaml
index 294ebdc9..c02857c1 100644
--- a/charts/opensearch-cluster/Chart.yaml
+++ b/charts/opensearch-cluster/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for OpenSearch Cluster
 type: application
 
 ## The opensearch-cluster Helm Chart version
-version: 2.6.1
+version: 2.7.0
 
 ## The operator version
 appVersion: 2.6.1