From d81cf4343ef80abd80ca8f29de59e704cc054e03 Mon Sep 17 00:00:00 2001
From: Steve Nay <265958+snay2@users.noreply.github.com>
Date: Mon, 11 Jul 2022 17:03:08 -0500
Subject: [PATCH] Update README during release-prep instead of after release

This simplifies our release process and keeps it in line with other projects we support. Mostly reverts commit 592a428dfd77c21c9cf697c77905f91f113529e5
---
 .github/workflows/release.yaml |  3 ---
 Makefile                       |  3 ---
 scripts/prepare-for-release    | 13 ++-----------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0c0a0a54..513cfbe7 100755
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -75,6 +75,3 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
-    
-    - name: Create NTH README Update PR
-      run: make create-release-prep-pr-readme
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 738c9cf9..0e21f23c 100644
--- a/Makefile
+++ b/Makefile
@@ -158,9 +158,6 @@ create-local-release-tag-patch:
 create-release-prep-pr:
 	${MAKEFILE_PATH}/scripts/prepare-for-release
 
-create-release-prep-pr-readme:
-	${MAKEFILE_PATH}/scripts/prepare-for-release -m
-
 create-release-prep-pr-draft:
 	${MAKEFILE_PATH}/scripts/prepare-for-release -d
 
diff --git a/scripts/prepare-for-release b/scripts/prepare-for-release
index afeb5664..4673dc2c 100755
--- a/scripts/prepare-for-release
+++ b/scripts/prepare-for-release
@@ -23,8 +23,7 @@ CHART=$REPO_ROOT_PATH/config/helm/aws-node-termination-handler/Chart.yaml
 CURR_CHART_VERSION=$(cat $CHART | grep 'version:' | xargs | cut -d' ' -f2 | tr -d '[:space:]')
 UPDATED_CHART_VERSION=""
 CHART_VALUES=$REPO_ROOT_PATH/config/helm/aws-node-termination-handler/values.yaml
-# ReadMe will be updated post-release due to long NTH release time
-FILES=("$CHART" "$CHART_VALUES")
+FILES=("$REPO_README" "$CHART" "$CHART_VALUES")
 FILES_CHANGED=()
 
 # release prep
@@ -54,7 +53,6 @@ HELP=$(cat << 'EOM'
 
   Options:
     -d      create a draft pr
-    -m      update versions in ReadMe only
     -r      target repo full name for the pr (default: aws/aws-node-termination-handler)
     -h      help
 
@@ -69,7 +67,7 @@ REPO_FULL_NAME=""
 NEED_ROLLBACK=true
 
 process_args() {
-    while getopts "hdmr:" opt; do
+    while getopts "hdr:" opt; do
         case ${opt} in
             h )
             echo -e "$HELP" 1>&2
@@ -78,13 +76,6 @@ process_args() {
             d )
             DRAFT=true
             ;;
-            m )
-            FILES=("$REPO_README")
-            # release should be completed, so no longer prep
-            COMMIT_MESSAGE="🥑🤖 $LATEST_TAG release 🤖🥑"
-            PR_TITLE="🥑🤖 $LATEST_TAG release"
-            RELEASE_PREP=false
-            ;;
             r )
             # todo: validate $REPO_FULL_NAME
             REPO_FULL_NAME="${OPTARG}"