update release workflow

aws · Feb 2, 2023 · b5fcee5 · b5fcee5
1 parent d2f240d
commit b5fcee5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,6 +1,8 @@
 name: VPC CNI Release
 
-on: [push, workflow_dispatch]
+on:
+  release:
+    types: [published]
 
 permissions:
   contents: read
@@ -11,11 +13,12 @@ env:
 
 jobs:
   release:
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest commit in the PR
         uses: actions/checkout@v3
+        with:
+          ref: "refs/tags/{{ github.event.release.tag_name }}"
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/scripts/generate-cni-yaml.sh b/scripts/generate-cni-yaml.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 
 PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
-HELM_VERSION="3.6.3"
+HELM_VERSION="3.11.0"
 NAMESPACE="kube-system"
 
 MAKEFILEPATH=$SCRIPTPATH/../Makefile
@@ -94,7 +94,7 @@ jq -c '.[]' $REGIONS_FILE | while read i; do
     mv $BUILD_DIR/helm_annotations_removed.yaml $NEW_METRICS_RESOURCES_YAML
 done    
 
-$BUILD_DIR/helm template --include-crds \
+$BUILD_DIR/helm template aws-vpc-cni --include-crds \
     --namespace $NAMESPACE \
     --output-dir $INDV_RESOURCES_DIR/ \
     $SCRIPTPATH/../charts/aws-vpc-cni/
@@ -104,7 +104,7 @@ for i in $INDV_RESOURCES_DIR/aws-vpc-cni/templates/*; do
   mv $BUILD_DIR/helm_annotations_removed.yaml $i
 done
 
-$BUILD_DIR/helm template \
+$BUILD_DIR/helm template cni-metrics-helper \
     --namespace $NAMESPACE \
     --output-dir $INDV_RESOURCES_DIR/ \
     $SCRIPTPATH/../charts/cni-metrics-helper/

diff --git a/scripts/sync-to-config-folder.sh b/scripts/sync-to-config-folder.sh
@@ -2,7 +2,6 @@
 set -euo pipefail
 set +x
 
-
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 BUILD_DIR="${SCRIPTPATH}/../build"
 
@@ -17,7 +16,7 @@ BINARY_BASE=""
 INCLUDE_NOTES=0
 MANUAL_VERIFY=1
 
-GH_CLI_VERSION="0.10.1"
+GH_CLI_VERSION="2.22.1"
 GH_CLI_CONFIG_PATH="${HOME}/.config/gh/config.yml"
 KERNEL=$(uname -s | tr '[:upper:]' '[:lower:]')
 OS="${KERNEL}"
@@ -180,4 +179,4 @@ git push -u origin "${FORK_RELEASE_BRANCH}":$RELEASE_BRANCH
 gh pr create --title "🥳 ${BINARY_BASE} ${VERSION} Automated manifest sync! 🥑" \
     --body "${PR_BODY}" --repo ${REPO} --base ${RELEASE_BRANCH}
 
-echo "✅ Manifest folder PR created for $RELEASE_BRANCH"
+echo "Manifest folder PR created for ${RELEASE_BRANCH}"
diff --git a/scripts/sync-to-eks-charts.sh b/scripts/sync-to-eks-charts.sh
@@ -21,7 +21,7 @@ BINARY_BASE=""
 INCLUDE_NOTES=0
 MANUAL_VERIFY=1
 
-GH_CLI_VERSION="0.10.1"
+GH_CLI_VERSION="2.22.1"
 GH_CLI_CONFIG_PATH="${HOME}/.config/gh/config.yml"
 KERNEL=$(uname -s | tr '[:upper:]' '[:lower:]')
 OS="${KERNEL}"
@@ -130,7 +130,6 @@ cd "${FORK_DIR}"
 git remote set-url origin https://"${GITHUB_USERNAME}":"${GITHUB_TOKEN}"@github.com/"${GITHUB_USERNAME}"/"${CHARTS_REPO_NAME}".git
 DEFAULT_BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\n')
 
-
 if diff -x ".*" -r "$HELM_CHART_DIR/" "${FORK_DIR}/stable/${HELM_CHART_NAME}/" &> /dev/null ; then
   echo " ✅  Charts already in sync; no updates needed"
   exit

diff --git a/scripts/upload-resources-to-github.sh b/scripts/upload-resources-to-github.sh
@@ -6,7 +6,6 @@ set -euo pipefail
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 VERSION=$(make -s -f $SCRIPTPATH/../Makefile version)
 BUILD_DIR=$SCRIPTPATH/../build/cni-rel-yamls/$VERSION
-BINARY_DIR=$SCRIPTPATH/../build/bin
 
 CNI_TAR_RESOURCES_FILE=$BUILD_DIR/cni_individual-resources.tar
 METRICS_TAR_RESOURCES_FILE=$BUILD_DIR/cni_metrics_individual-resources.tar