From bfdcde26ccc1f765b7ce0b6d74f54a005983bd66 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Fri, 4 Jun 2021 19:58:10 -0700
Subject: [PATCH 1/3] Fix binary promotion PR process

---
 docs/contributing/release-process.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/contributing/release-process.md b/docs/contributing/release-process.md
index e579b86cbb168..20cac30ce7e23 100644
--- a/docs/contributing/release-process.md
+++ b/docs/contributing/release-process.md
@@ -156,6 +156,7 @@ hub pull-request
 ### Propose promotion of artifacts
 
 The `cip` tool is from [kubernetes-sigs/k8s-container-image-promoter](https://github.com/kubernetes-sigs/k8s-container-image-promoter).
+The `kpromo` tool is from [kubernetes/release/](https://github.com/kubernetes/release/tree/master/cmd/kpromo).
 The `gsutil` tool may be obtained from `pip3`.
 
 Create container promotion PR:
@@ -193,10 +194,11 @@ git checkout main
 git pull
 git checkout -b kops_artifacts_${VERSION}
 
+rm -rf ./k8s-staging-kops/kops/releases
 mkdir -p ./k8s-staging-kops/kops/releases/${VERSION}/
 gsutil rsync -r  gs://k8s-staging-kops/kops/releases/${VERSION}/ ./k8s-staging-kops/kops/releases/${VERSION}/
 
-promobot-generate-manifest --src k8s-staging-kops/kops/releases/ >> artifacts/manifests/k8s-staging-kops/${VERSION}.yaml
+kpromo  manifest files --src k8s-staging-kops/kops/releases/ >> artifacts/manifests/k8s-staging-kops/${VERSION}.yaml
 ```
 
 Verify, then send a PR:

From ba36b37afa392bdc216945a997ff8a648f2671e7 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Fri, 4 Jun 2021 20:24:38 -0700
Subject: [PATCH 2/3] Simplify release notes compilation steps

---
 docs/contributing/release-process.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/contributing/release-process.md b/docs/contributing/release-process.md
index 20cac30ce7e23..567ced59f4de2 100644
--- a/docs/contributing/release-process.md
+++ b/docs/contributing/release-process.md
@@ -136,11 +136,10 @@ git checkout master
 git pull
 git checkout -b relnotes_${VERSION}
 
-FROM=1.21.0-alpha.2
-TO=1.21.0-alpha.3
-DOC=1.21
-git log v${FROM}..v${TO} --oneline | grep Merge.pull | grep -v Revert..Merge.pull | cut -f 5 -d ' ' | tac  > /tmp/prs
-echo -e "\n## ${FROM} to ${TO}\n"  >> docs/releases/${DOC}-NOTES.md
+FROM=1.21.0-alpha.2 # Replace "1.21.0-alpha.2" with the previous version
+DOC=$(expr ${VERSION} : '\([^.]*.[^.]*\)')
+git log v${FROM}..v${VERSION} --oneline | grep Merge.pull | grep -v Revert..Merge.pull | cut -f 5 -d ' ' | tac  > /tmp/prs
+echo -e "\n## ${FROM} to ${VERSION}\n"  >> docs/releases/${DOC}-NOTES.md
 relnotes  -config .shipbot.yaml  < /tmp/prs  >> docs/releases/${DOC}-NOTES.md
 ```
 

From d04c2acf244a74fdb79b489cde5910c984ceca90 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Fri, 4 Jun 2021 21:16:47 -0700
Subject: [PATCH 3/3] Address review comment

Co-authored-by: Peter Rifel <rifelpet@users.noreply.github.com>
---
 docs/contributing/release-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing/release-process.md b/docs/contributing/release-process.md
index 567ced59f4de2..4bf6bc14d7e1e 100644
--- a/docs/contributing/release-process.md
+++ b/docs/contributing/release-process.md
@@ -197,7 +197,7 @@ rm -rf ./k8s-staging-kops/kops/releases
 mkdir -p ./k8s-staging-kops/kops/releases/${VERSION}/
 gsutil rsync -r  gs://k8s-staging-kops/kops/releases/${VERSION}/ ./k8s-staging-kops/kops/releases/${VERSION}/
 
-kpromo  manifest files --src k8s-staging-kops/kops/releases/ >> artifacts/manifests/k8s-staging-kops/${VERSION}.yaml
+kpromo manifest files --src k8s-staging-kops/kops/releases/ >> artifacts/manifests/k8s-staging-kops/${VERSION}.yaml
 ```
 
 Verify, then send a PR: