Skip to content

Commit

Permalink
Bump version to v1.1.1 (#163)
Browse files Browse the repository at this point in the history
* Also remove unnecessary 'rm' call from Makefile
  • Loading branch information
waynr authored Jul 2, 2019
1 parent 637e3ad commit bff9108
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## unreleased
## unreleased\n
## v1.1.1 - 2019.07.02

* Set a custom user agent for the godo client. [[GH-156](https://github.com/digitalocean/csi-digitalocean/pull/156)]
* Include `xfsprogs` in the base Docker image so that XFS can be used
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ all: test
publish: compile build push clean

.PHONY: bump-version
bump-version:
bump-version:
@[ "${NEW_VERSION}" ] || ( echo "NEW_VERSION must be set (ex. make NEW_VERSION=v1.x.x bump-version)"; exit 1 )
@(echo ${NEW_VERSION} | grep -E "^v") || ( echo "NEW_VERSION must be a semver ('v' prefix is required)"; exit 1 )
@echo "Bumping VERSION from $(VERSION) to $(NEW_VERSION)"
Expand All @@ -27,9 +27,8 @@ bump-version:
@sed -i'' -e 's/${VERSION}/${NEW_VERSION}/g' deploy/kubernetes/releases/csi-digitalocean-${NEW_VERSION}.yaml
@sed -i'' -e 's/${VERSION}/${NEW_VERSION}/g' README.md
$(eval NEW_DATE = $(shell date +%Y.%m.%d))
@sed -i'' -e 's/## unreleased/## ${NEW_VERSION} - ${NEW_DATE}/g' CHANGELOG.md
@sed -i'' -e 's/## unreleased/## ${NEW_VERSION} - ${NEW_DATE}/g' CHANGELOG.md
@ echo '## unreleased\n' | cat - CHANGELOG.md > temp && mv temp CHANGELOG.md
@rm README.md-e CHANGELOG.md-e deploy/kubernetes/releases/csi-digitalocean-${NEW_VERSION}.yaml-e

.PHONY: compile
compile:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Cloud Foundry. Feel free to test it on other CO's and give us a feedback.
## Releases

The DigitalOcean CSI plugin follows [semantic versioning](https://semver.org/).
The current version is: **`v1.1.0`**. The project is still
The current version is: **`v1.1.1`**. The project is still
under active development and may not be production ready. The plugin will be
bumped following the rules below:

Expand Down Expand Up @@ -119,10 +119,10 @@ digitalocean Opaque 1 18h

Before you continue, be sure to checkout to a [tagged
release](https://github.com/digitalocean/csi-digitalocean/releases). Always use the [latest stable version](https://github.com/digitalocean/csi-digitalocean/releases/latest)
For example, to use the latest stable version (`v1.1.0`) you can execute the following command:
For example, to use the latest stable version (`v1.1.1`) you can execute the following command:

```
$ kubectl apply -f https://raw.githubusercontent.com/digitalocean/csi-digitalocean/master/deploy/kubernetes/releases/csi-digitalocean-v1.1.0.yaml
$ kubectl apply -f https://raw.githubusercontent.com/digitalocean/csi-digitalocean/master/deploy/kubernetes/releases/csi-digitalocean-v1.1.1.yaml
```

This file will be always updated to point to the latest stable release. If you
Expand Down Expand Up @@ -238,7 +238,7 @@ Dependencies are managed via [Go modules](https://github.com/golang/go/wiki/Modu
To release a new version bump first the version:

```
$ make NEW_VERSION=v1.1.0 bump-version
$ make NEW_VERSION=v1.1.1 bump-version
```

Make sure everything looks good. Create a new branch with all changes:
Expand All @@ -251,15 +251,15 @@ $ git push origin

After it's merged to master, [create a new Github
release](https://github.com/digitalocean/csi-digitalocean/releases/new) from
master with the version `v1.1.0` and then publish a new docker build:
master with the version `v1.1.1` and then publish a new docker build:

```
$ git checkout master
$ make publish
```

This will create a binary with version `v1.1.0` and docker image pushed to
`digitalocean/do-csi-plugin:v1.1.0`
This will create a binary with version `v1.1.1` and docker image pushed to
`digitalocean/do-csi-plugin:v1.1.1`

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.0
v1.1.1

0 comments on commit bff9108

Please sign in to comment.