Skip to content

Commit bf950ad

Browse files
detiberk8s-ci-robot
authored andcommitted
Release v0.1.4 (#1084)
1 parent d1b07f4 commit bf950ad

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
2222
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
2323

2424
# Image URL to use all building/pushing image targets
25-
export CONTROLLER_IMG ?= gcr.io/k8s-cluster-api/cluster-api-controller:0.1.3
25+
export CONTROLLER_IMG ?= gcr.io/k8s-cluster-api/cluster-api-controller:v0.1.4
2626
export EXAMPLE_PROVIDER_IMG ?= gcr.io/k8s-cluster-api/example-provider-controller:latest
2727

2828
all: test manager clusterctl

config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ spec:
77
template:
88
spec:
99
containers:
10-
- image: gcr.io/k8s-cluster-api/cluster-api-controller:0.1.3
10+
- image: gcr.io/k8s-cluster-api/cluster-api-controller:v0.1.4
1111
name: manager

docs/developer/releasing.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,35 @@
1111

1212
1. The container image is found in the registry `gcr.io/k8s-cluster-api` with an
1313
image name of `cluster-api-controller` and a tag that matches the release
14-
version. For example, in the `0.0.0-alpha.4` release, the container image
15-
location is `gcr.io/k8s-cluster-api/cluster-api-controller:0.0.0-alpha.4`
14+
version. For example, in the `v0.1.4` release, the container image
15+
location is `gcr.io/k8s-cluster-api/cluster-api-controller:v0.1.4`
16+
17+
1. Prior to the `v0.1.4` release, the container image is found in the
18+
registry `gcr.io/k8s-cluster-api` with an image name of `cluster-api-controller`
19+
and a tag that matches the release version. For example, in the `0.1.3` release,
20+
the container image location is `gcr.io/k8s-cluster-api/cluster-api-controller:0.1.3`
1621

1722
## Process
1823

19-
For version 0.x.y:
24+
For version v0.x.y:
2025

21-
1. We will target a branch called `release-0.x`. If this is `0.x.0` then we'll
26+
1. We will target a branch called `release-0.x`. If this is `v0.x.0` then we'll
2227
create a branch from master using `git push origin master:release-0.x`, otherwise
2328
simply checkout the existing branch `git checkout release-0.x`
2429
2. Make two changes:
2530
1. Change [the cluster api controller manager image
2631
tag][managerimg] from `:latest` to whatever version is being released
27-
2. Change the `CONTROLLER_IMG` variable in the [Makefile][makefile] to the
32+
1. Change the `CONTROLLER_IMG` variable in the [Makefile][makefile] to the
2833
version being released
2934
(Note that we do not release the example-provider image, so we don't tag that)
30-
3. Commit it using `git commit -m "Release 0.x.y"`
35+
3. Commit it using `git commit -m "Release v0.x.y"`
3136
4. Submit a PR to the `release-0.x` branch, e.g. `git push $USER; hub pull-request -b release-0.x`
3237
5. Get the pull request merged
3338
6. Switch to the release branch and update to pick up the commit. (e.g. `git
3439
checkout release 0.x && git pull`). From there build and push the container
35-
images and fat manifest with `make all-push` (on the 0.1 release branch, we
40+
images and fat manifest with `REGISTRY="gcr.io/k8s-cluster-api" make all-push` (on the 0.1 release branch, we
3641
do `make docker-push`)
37-
7. Create a tag from this same commit `git tag 0.x.y` and push the tag to the github repository `git push origin 0.x.y`
42+
7. Create an annotated tag from this same commit `git tag -a v0.x.y -m v0.x.y` and push the tag to the github repository `git push origin v0.x.y`
3843
8. Create a release in github based on the tag created above
3944
9. Manually create the release notes by going through the merged PRs since the
4045
last release

0 commit comments

Comments
 (0)