From 7756e029b14bee21a56f430fc6ccea0c15c3611f Mon Sep 17 00:00:00 2001
From: Terry Howe <tlhowe@amazon.com>
Date: Tue, 30 Mar 2021 13:11:24 -0600
Subject: [PATCH] Remove project release file (#262)

---
 docs/contents/runbook.md                                    | 2 --
 projects/kubernetes/kubernetes/1-18/RELEASE                 | 1 -
 projects/kubernetes/kubernetes/1-19/RELEASE                 | 1 -
 projects/kubernetes/kubernetes/1-20/RELEASE                 | 1 -
 projects/kubernetes/kubernetes/build/create_binaries.sh     | 3 ++-
 projects/kubernetes/kubernetes/build/create_version_file.sh | 3 ++-
 6 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 projects/kubernetes/kubernetes/1-18/RELEASE
 delete mode 100644 projects/kubernetes/kubernetes/1-19/RELEASE
 delete mode 100644 projects/kubernetes/kubernetes/1-20/RELEASE

diff --git a/docs/contents/runbook.md b/docs/contents/runbook.md
index e47dc642cc..2e93713828 100644
--- a/docs/contents/runbook.md
+++ b/docs/contents/runbook.md
@@ -12,7 +12,6 @@ unless there is a change.
    * release/${RELEASE_BRANCH}/RELEASE-PUBLIC (set to 0)
    * projects/kubernetes/kubernetes/${RELEASE_BRANCH}/GIT_TAG
    * projects/kubernetes/kubernetes/${RELEASE_BRANCH}/KUBE_GIT_VERSION_FILE
-   * projects/kubernetes/kubernetes/${RELEASE_BRANCH}/RELEASE (set to 0)
    * Create GIT_TAG files for other components (etcd, coredns, ...)
    * Add support in kops script for new release
 1. **Docs PR**: Create a PR with an empty change log and docs for release
@@ -27,7 +26,6 @@ unless there is a change.
 1. **Create EKS Distro Release PR**: Modify components to create a release
    * release/${RELEASE_BRANCH}/RELEASE (set to 1)
    * release/${RELEASE_BRANCH}/RELEASE-PUBLIC (set to 1)
-   * projects/kubernetes/kubernetes/${RELEASE_BRANCH}/RELEASE (set to 1)
 1. **Docs PR**: Do final update to documentation with CRD
    * docs/contents/releases/${RELEASE_BRANCH}/${RELEASE}/index.md
    * docs/contents/releases/${RELEASE_BRANCH}/${RELEASE}/CHANGELOG*
diff --git a/projects/kubernetes/kubernetes/1-18/RELEASE b/projects/kubernetes/kubernetes/1-18/RELEASE
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/projects/kubernetes/kubernetes/1-18/RELEASE
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/projects/kubernetes/kubernetes/1-19/RELEASE b/projects/kubernetes/kubernetes/1-19/RELEASE
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/projects/kubernetes/kubernetes/1-19/RELEASE
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/projects/kubernetes/kubernetes/1-20/RELEASE b/projects/kubernetes/kubernetes/1-20/RELEASE
deleted file mode 100644
index 573541ac97..0000000000
--- a/projects/kubernetes/kubernetes/1-20/RELEASE
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/projects/kubernetes/kubernetes/build/create_binaries.sh b/projects/kubernetes/kubernetes/build/create_binaries.sh
index 98995412de..ace65a6772 100755
--- a/projects/kubernetes/kubernetes/build/create_binaries.sh
+++ b/projects/kubernetes/kubernetes/build/create_binaries.sh
@@ -28,7 +28,8 @@ GOLANG_VERSION="$4"
 source "${MAKE_ROOT}/build/lib/init.sh"
 source "${MAKE_ROOT}/../../../build/lib/common.sh"
 
-RELEASE_FILE="${MAKE_ROOT}/${RELEASE_BRANCH}/RELEASE"
+BASE_DIRECTORY=$(git rev-parse --show-toplevel)
+RELEASE_FILE="${BASE_DIRECTORY}/release/${RELEASE_BRANCH}/RELEASE"
 PATCH_DIR=${MAKE_ROOT}/${RELEASE_BRANCH}/patches
 export KUBE_GIT_VERSION=$(build::version::kube_git_version $GIT_TAG $RELEASE_FILE $RELEASE_BRANCH)
 if [ -d ${OUTPUT_DIR}/${RELEASE_BRANCH}/bin ]; then
diff --git a/projects/kubernetes/kubernetes/build/create_version_file.sh b/projects/kubernetes/kubernetes/build/create_version_file.sh
index 93a9856e2f..bb0ddf88ea 100755
--- a/projects/kubernetes/kubernetes/build/create_version_file.sh
+++ b/projects/kubernetes/kubernetes/build/create_version_file.sh
@@ -20,6 +20,7 @@ set -o pipefail
 TAG=$1
 RELEASE_BRANCH=$2
 
+BASE_DIRECTORY=$(git rev-parse --show-toplevel)
 MAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 source "${MAKE_ROOT}/build/lib/init.sh"
 BIN_DIR="${OUTPUT_DIR}/${RELEASE_BRANCH}/bin"
@@ -31,5 +32,5 @@ fi
 VERSION_FILE="${MAKE_ROOT}/${RELEASE_BRANCH}/KUBE_GIT_VERSION_FILE"
 rm -f $VERSION_FILE
 touch $VERSION_FILE
-RELEASE_FILE="${MAKE_ROOT}/${RELEASE_BRANCH}/RELEASE"
+RELEASE_FILE="${BASE_DIRECTORY}/release/${RELEASE_BRANCH}/RELEASE"
 build::version::create_env_file "$TAG" "$VERSION_FILE" "$RELEASE_FILE" "kubernetes" "$RELEASE_BRANCH"