Merge pull request #874 from cdrage/release-1.5.0

1.5.0 Release
kubernetes · Nov 21, 2017 · 999278f · 999278f
2 parents a567cff + a2575df
commit 999278f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.5.0](https://github.com/kubernetes/kompose/tree/v1.5.0) (2017-11-21)
+[Full Changelog](https://github.com/kubernetes/kompose/compare/v1.4.0...v1.5.0)
+
+**Merged pull requests:**
+
+-  Set PVC volume size with kompose.volume.size [\#867](https://github.com/kubernetes/kompose/pull/867) ([abitrolly](https://github.com/abitrolly))
+- architecture.md  Link sources [\#866](https://github.com/kubernetes/kompose/pull/866) ([abitrolly](https://github.com/abitrolly))
+- Move version information to separate file [\#864](https://github.com/kubernetes/kompose/pull/864) ([cdrage](https://github.com/cdrage))
+- Fix typo [\#863](https://github.com/kubernetes/kompose/pull/863) ([xianlubird](https://github.com/xianlubird))
+- Ignore links attribute and print warning message [\#862](https://github.com/kubernetes/kompose/pull/862) ([xianlubird](https://github.com/xianlubird))
+- Add TOC to documentation, add readme.md notice [\#861](https://github.com/kubernetes/kompose/pull/861) ([cdrage](https://github.com/cdrage))
+- Update CSS [\#860](https://github.com/kubernetes/kompose/pull/860) ([cdrage](https://github.com/cdrage))
+
 ## [v1.4.0](https://github.com/kubernetes/kompose/tree/v1.4.0) (2017-10-31)
 [Full Changelog](https://github.com/kubernetes/kompose/compare/v1.3.0...v1.4.0)
 
@@ -14,6 +27,7 @@
 
 **Merged pull requests:**
 
+- 1.4.0 Release [\#858](https://github.com/kubernetes/kompose/pull/858) ([cdrage](https://github.com/cdrage))
 - Updated `--help` page for `kompose up` [\#852](https://github.com/kubernetes/kompose/pull/852) ([surajnarwade](https://github.com/surajnarwade))
 - Fix Redirecting Error in README.md [\#849](https://github.com/kubernetes/kompose/pull/849) ([piyush1594](https://github.com/piyush1594))
 - Redirects not working [\#848](https://github.com/kubernetes/kompose/pull/848) ([cdrage](https://github.com/cdrage))

diff --git a/README.md b/README.md
@@ -44,18 +44,18 @@ __Linux and macOS:__
 
 ```sh
 # Linux
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-linux-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-linux-amd64 -o kompose
 
 # macOS
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-darwin-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-darwin-amd64 -o kompose
 
 chmod +x kompose
 sudo mv ./kompose /usr/local/bin/kompose
 ```
 
 __Windows:__
 
-Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-windows-amd64.exe) and add the binary to your PATH.
+Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-windows-amd64.exe) and add the binary to your PATH.
 
 ## Shell autocompletion
 

diff --git a/build/VERSION b/build/VERSION
@@ -1 +1 @@
-1.4.0
+1.5.0
diff --git a/docs/installation.md b/docs/installation.md
@@ -10,18 +10,18 @@ __Linux and macOS:__
 
 ```sh
 # Linux
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-linux-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-linux-amd64 -o kompose
 
 # macOS
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-darwin-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-darwin-amd64 -o kompose
 
 chmod +x kompose
 sudo mv ./kompose /usr/local/bin/kompose
 ```
 
 __Windows:__
 
-Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-windows-amd64.exe) and add the binary to your PATH.
+Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-windows-amd64.exe) and add the binary to your PATH.
 
 
 #### Nightly / master release

diff --git a/docs/introduction.md b/docs/introduction.md
@@ -47,13 +47,13 @@ Grab the Kompose binary!
 
 ```sh
 # Linux
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-linux-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-linux-amd64 -o kompose
 
 # macOS
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-darwin-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-darwin-amd64 -o kompose
 
 chmod +x kompose
 sudo mv ./kompose /usr/local/bin/kompose
 ```
 
-_Windows:_ Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.4.0/kompose-windows-amd64.exe) and add the binary to your PATH.
+_Windows:_ Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-windows-amd64.exe) and add the binary to your PATH.
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -2,7 +2,7 @@ package version
 
 var (
 	// VERSION  is version number that wil be displayed when running ./kompose version
-	VERSION = "1.4.0"
+	VERSION = "1.5.0"
 	// GITCOMMIT is hash of the commit that wil be displayed when running ./kompose version
 	// this will be overwritten when running  build like this: go build -ldflags="-X github.com/kubernetes/kompose/pkg/version.GITCOMMIT=$(GITCOMMIT)"
 	// HEAD is default indicating that this was not set during build