diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b3da4f..58ba0d9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Change Log +## [v1.13.0](https://github.com/kubernetes/kompose/tree/v1.13.0) (2018-05-14) +[Full Changelog](https://github.com/kubernetes/kompose/compare/v1.12.0...v1.13.0) + +**Closed issues:** + +- Kubernetes multiple volumeMounts with subPath and 1 configmap volume - onle 1 volumeMount works [\#1005](https://github.com/kubernetes/kompose/issues/1005) +- Environment value merge failed with multiple docker-compose files [\#972](https://github.com/kubernetes/kompose/issues/972) +- Merge multiple docker-compose files [\#968](https://github.com/kubernetes/kompose/issues/968) +- Docker compose links section can't support [\#859](https://github.com/kubernetes/kompose/issues/859) + +**Merged pull requests:** + +- Add label 'kompose.controller.type' set service convert controller type [\#1001](https://github.com/kubernetes/kompose/pull/1001) ([xianlubird](https://github.com/xianlubird)) +- Add some deprecated info warning [\#1000](https://github.com/kubernetes/kompose/pull/1000) ([xianlubird](https://github.com/xianlubird)) +- Support compose global deploy mode to daemonset [\#999](https://github.com/kubernetes/kompose/pull/999) ([xianlubird](https://github.com/xianlubird)) +- Typo fix: wil-\>will [\#998](https://github.com/kubernetes/kompose/pull/998) ([AdamDang](https://github.com/AdamDang)) +- Remove go1.6 support in ci [\#997](https://github.com/kubernetes/kompose/pull/997) ([hangyan](https://github.com/hangyan)) +- Fix doc that we have support v3.1 & 3.2 [\#993](https://github.com/kubernetes/kompose/pull/993) ([xianlubird](https://github.com/xianlubird)) +- Fix golint warnings [\#992](https://github.com/kubernetes/kompose/pull/992) ([xianlubird](https://github.com/xianlubird)) +- Remove incorrect logging about headless service [\#991](https://github.com/kubernetes/kompose/pull/991) ([hangyan](https://github.com/hangyan)) +- Fix missing attribute when convert with multiple docker-compose files [\#990](https://github.com/kubernetes/kompose/pull/990) ([xianlubird](https://github.com/xianlubird)) +- Fix typo in conversion.md [\#989](https://github.com/kubernetes/kompose/pull/989) ([jonathanperret](https://github.com/jonathanperret)) + ## [v1.12.0](https://github.com/kubernetes/kompose/tree/v1.12.0) (2018-04-18) [Full Changelog](https://github.com/kubernetes/kompose/compare/v1.11.0...v1.12.0) @@ -15,6 +38,7 @@ **Merged pull requests:** +- 1.12.0 Release [\#988](https://github.com/kubernetes/kompose/pull/988) ([cdrage](https://github.com/cdrage)) - Typo fix [\#987](https://github.com/kubernetes/kompose/pull/987) ([jonyhy96](https://github.com/jonyhy96)) - Typo fix in conversion.md [\#985](https://github.com/kubernetes/kompose/pull/985) ([AdamDang](https://github.com/AdamDang)) - Fix some typo [\#983](https://github.com/kubernetes/kompose/pull/983) ([xianlubird](https://github.com/xianlubird)) diff --git a/README.md b/README.md index 65a0c64c..ea4b4181 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,10 @@ __Linux and macOS:__ ```sh # Linux -curl -L https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-linux-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-linux-amd64 -o kompose # macOS -curl -L https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-darwin-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-darwin-amd64 -o kompose chmod +x kompose sudo mv ./kompose /usr/local/bin/kompose @@ -55,7 +55,7 @@ sudo mv ./kompose /usr/local/bin/kompose __Windows:__ -Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-windows-amd64.exe) and add the binary to your PATH. +Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-windows-amd64.exe) and add the binary to your PATH. ## Shell autocompletion diff --git a/build/VERSION b/build/VERSION index 0eed1a29..feaae22b 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.12.0 +1.13.0 diff --git a/docs/installation.md b/docs/installation.md index ddfad93b..d37782b1 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -10,10 +10,10 @@ __Linux and macOS:__ ```sh # Linux -curl -L https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-linux-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-linux-amd64 -o kompose # macOS -curl -L https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-darwin-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-darwin-amd64 -o kompose chmod +x kompose sudo mv ./kompose /usr/local/bin/kompose @@ -21,7 +21,7 @@ sudo mv ./kompose /usr/local/bin/kompose __Windows:__ -Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-windows-amd64.exe) and add the binary to your PATH. +Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-windows-amd64.exe) and add the binary to your PATH. #### Go diff --git a/docs/introduction.md b/docs/introduction.md index 84b252cb..4f47dd5b 100644 --- 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.12.0/kompose-linux-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-linux-amd64 -o kompose # macOS -curl -L https://github.com/kubernetes/kompose/releases/download/v1.12.0/kompose-darwin-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.13.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.12.0/kompose-windows-amd64.exe) and add the binary to your PATH. +_Windows:_ Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.13.0/kompose-windows-amd64.exe) and add the binary to your PATH. diff --git a/pkg/version/version.go b/pkg/version/version.go index b22f5f2a..17ce8bad 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -2,7 +2,7 @@ package version var ( // VERSION is version number that will be displayed when running ./kompose version - VERSION = "1.12.0" + VERSION = "1.13.0" // GITCOMMIT is hash of the commit that will 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