Skip to content

Commit

Permalink
Update the release process
Browse files Browse the repository at this point in the history
  • Loading branch information
hakman committed Jun 17, 2024
1 parent 8c0b07d commit 870a1fa
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .shipbot.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/build-assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion dev/set-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions dev/tag-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
16 changes: 8 additions & 8 deletions docs/release-process.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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.

Expand All @@ -52,18 +52,18 @@ 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}"
```

```
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
Expand All @@ -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
```

Expand Down

0 comments on commit 870a1fa

Please sign in to comment.