Merge pull request #13 from justinsb/pick_up_on_tags

chore: fix version extraction from tags
kubernetes-sigs · Oct 11, 2024 · af54689 · af54689
2 parents 0a01aa3 + f7f4d36
commit af54689
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dev/push-etcd-manager.sh b/dev/push-etcd-manager.sh
@@ -21,7 +21,7 @@ REPO_ROOT="$(git rev-parse --show-toplevel)"
 cd "${REPO_ROOT}"
 
 if [[ -z "${VERSION:-}" ]]; then
-  VERSION=$(git describe --always --match 'etcd-manager/*' | sed s@etcd-manager/@@g)
+  VERSION=$(git describe --always)
 fi
 
 if [[ -z "${DOCKER_REGISTRY:-}" ]]; then

diff --git a/docs/release-process.md b/docs/release-process.md
@@ -16,14 +16,14 @@ git pull upstream master
 
 Set the version using `dev/set-version.sh`:
 ```
-etcd-manager/dev/set-version.sh
-VERSION="$(cat etcd-manager/version.txt)"
+dev/set-version.sh
+VERSION="$(cat version.txt)"
 ```
 
 Create the branch and commit the changes (without pushing):
 ```
 git checkout -b release_${VERSION}
-git add etcd-manager/version.txt && git commit -m "Release etcd-manager/v${VERSION}"
+git add version.txt && git commit -m "Release v${VERSION}"
 ```
 
 This is the "release commit". Push and create a PR.
@@ -52,7 +52,7 @@ Create container promotion PR:
 
 ```
 # Should show image tags
-crane ls gcr.io/k8s-staging-etcd-manager | grep "${VERSION}"
+crane ls us-central1-docker.pkg.dev/k8s-staging-images/etcd-manager/etcd-manager-slim | grep "${VERSION}"
 ```
 
 ```