From 870a1fa6345d40475f0088de3906b2d8ba156444 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Mon, 17 Jun 2024 08:21:37 +0300
Subject: [PATCH] Update the release process

---
 .shipbot.yaml           |  2 +-
 dev/build-assets.sh     |  2 +-
 dev/set-version.sh      |  2 +-
 dev/tag-release.sh      |  8 ++++----
 docs/release-process.md | 16 ++++++++--------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.shipbot.yaml b/.shipbot.yaml
index 2d480ae24..0056e45f0 100644
--- a/.shipbot.yaml
+++ b/.shipbot.yaml
@@ -1,5 +1,5 @@
 owner: kubernetes-sigs
-repo: etcdadm
+repo: etcd-manager
 assets:
 - source: dist/etcd-manager-ctl-windows-amd64
   githubName: etcd-manager-ctl-windows-amd64
diff --git a/dev/build-assets.sh b/dev/build-assets.sh
index 872b36fd5..c11763792 100755
--- a/dev/build-assets.sh
+++ b/dev/build-assets.sh
@@ -28,7 +28,7 @@ CMDS="etcd-manager-ctl"
 
 # cd to the etcd-manager root
 REPO_ROOT="$(git rev-parse --show-toplevel)"
-cd "${REPO_ROOT}"/etcd-manager
+cd "${REPO_ROOT}"
 
 # Ensure the dist folder exists and is clean
 rm -fr dist/ && mkdir -p dist/
diff --git a/dev/set-version.sh b/dev/set-version.sh
index ab9a6918b..b6b4a9201 100755
--- a/dev/set-version.sh
+++ b/dev/set-version.sh
@@ -22,4 +22,4 @@ if [[ ! "${VERSION}" =~ ^([0-9]+[.][0-9]+)[.]([0-9]+)(-(alpha|beta)[.]([0-9]+))?
   exit 1
 fi
 
-echo "${VERSION}" > etcd-manager/version.txt
+echo "${VERSION}" > version.txt
diff --git a/dev/tag-release.sh b/dev/tag-release.sh
index 40c1f7a94..310d6ed35 100755
--- a/dev/tag-release.sh
+++ b/dev/tag-release.sh
@@ -21,10 +21,10 @@ if [[ ! "${VERSION}" =~ ^([0-9]+[.][0-9]+)[.]([0-9]+)(-(alpha|beta)[.]([0-9]+))?
   exit 1
 fi
 
-if [ "$(git tag -l "etcd-manager/v${VERSION}")" ]; then
-  echo "Tag etcd-manager/v${VERSION} already exists"
+if [ "$(git tag -l "v${VERSION}")" ]; then
+  echo "Tag v${VERSION} already exists"
   exit 0
 fi
 
-git tag -a -m "Release ${VERSION}" "etcd-manager/v${VERSION}"
-git push origin "etcd-manager/v${VERSION}"
+git tag -a -m "Release ${VERSION}" "v${VERSION}"
+git push origin "v${VERSION}"
diff --git a/docs/release-process.md b/docs/release-process.md
index 9f5115453..b149b70f9 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -1,6 +1,6 @@
 # Release Process
 
-etcdadm & etcd-manager are released on an as-needed basis.
+etcd-manager is released on an as-needed basis.
 
 ## Check builds OK
 
@@ -36,7 +36,7 @@ gh pr create -f
 
 The staging job should now see the tag, and build it (from the trusted prow cluster, using Google Cloud Build).
 
-The job is here: https://testgrid.k8s.io/sig-cluster-lifecycle-etcdadm#etcdadm-postsubmit-push-to-staging
+The job is here: https://testgrid.k8s.io/sig-etcd-etcd-manager-postsubmit-push-to-staging
 
 It (currently) takes about 10 minutes to run.
 
@@ -52,7 +52,7 @@ Create container promotion PR:
 
 ```
 # Should show image tags
-crane ls gcr.io/k8s-staging-etcdadm/etcd-manager | grep "${VERSION}"
+crane ls gcr.io/k8s-staging-etcd-manager | grep "${VERSION}"
 ```
 
 ```
@@ -60,10 +60,10 @@ cd ../k8s.io
 
 git checkout main
 git pull
-git checkout -b etcdadm_images_${VERSION}
+git checkout -b etcd-manager_images_${VERSION}
 
-echo "# ${VERSION}" >> registry.k8s.io/images/k8s-staging-etcdadm/images.yaml
-kpromo cip --snapshot gcr.io/k8s-staging-etcdadm --snapshot-tag "v${VERSION}" >> registry.k8s.io/images/k8s-staging-etcdadm/images.yaml
+echo "# ${VERSION}" >> registry.k8s.io/images/k8s-staging-etcd-manager/images.yaml
+kpromo cip --snapshot gcr.io/k8s-staging-etcd-manager --snapshot-tag "v${VERSION}" >> registry.k8s.io/images/k8s-staging-etcd-manager/images.yaml
 ```
 
 You can dry-run the promotion with
@@ -75,8 +75,8 @@ kpromo cip --thin-manifest-dir k8s.gcr.io
 Send the image promotion PR:
 
 ```
-git add -p registry.k8s.io/images/k8s-staging-etcdadm/images.yaml
-git commit -m "Promote etcdadm ${VERSION} images"
+git add -p registry.k8s.io/images/k8s-staging-etcd-manager/images.yaml
+git commit -m "Promote etcd-manager ${VERSION} images"
 gh pr create --fill --base main --repo kubernetes/k8s.io
 ```