Commit Graph

1085 Commits

Author SHA1 Message Date
Suraj Narwade
286fbd1203 Fixed kompose build failure
While `local` build, kompose was not recognizing `dockerfile` key
Hence it was breaking the build as mentioned in issue #832.
This PR will fix the issue.
2017-12-01 11:15:03 +05:30
Suraj Narwade
8a5692b070
Merge pull request #880 from cdrage/update-windows-failing-vendoring
Update vendoring / fix Windows builds
2017-12-01 11:12:42 +05:30
Charlie Drage
63e063818a Fix failing issues with vendoring as well as compiling
Something within golang.org/x/sys messed up and it doesn't help that we
have three different projects using different versions.

This vendor update specifies a golang.org/x/sys as well as fixes the
previous compiling issues with Windows/Linux/macOS builds.

See issue:

```sh
gox -osarch="darwin/amd64 linux/amd64 linux/arm windows/amd64"
-output="bin/kompose-{{.OS}}-{{.Arch}}" -ldflags="-w -X
github.com/kubernetes/kompose/pkg/version.GITCOMMIT=42e7f0e"
Number of parallel builds: 1
-->   windows/amd64: github.com/kubernetes/kompose
-->     linux/amd64: github.com/kubernetes/kompose
-->    darwin/amd64: github.com/kubernetes/kompose
-->       linux/arm: github.com/kubernetes/kompose
1 errors occurred:
--> windows/amd64 error: exit status 2
Stderr: #
github.com/kubernetes/kompose/vendor/golang.org/x/crypto/ssh/terminal
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_ECHO_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_PROCESSED_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_LINE_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:42: undefined:
windows.ENABLE_PROCESSED_OUTPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:43: undefined:
windows.SetConsoleMode
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:62: undefined:
windows.SetConsoleMode
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:67: undefined:
windows.ConsoleScreenBufferInfo
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:68: undefined:
windows.GetConsoleScreenBufferInfo
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:91: undefined:
windows.ENABLE_ECHO_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:92: undefined:
windows.ENABLE_PROCESSED_INPUT
vendor/golang.org/x/crypto/ssh/terminal/util_windows.go:92: too many
errors
```
2017-11-30 18:54:47 -05:00
Charlie Drage
2f307b0f4e
Merge pull request #882 from cdrage/cross-compile-test
Test cross-compiling within travis
2017-11-30 18:53:57 -05:00
Charlie Drage
28809d944b Test cross-compiling within travis
Tests cross compiling by building on 1.6 of Go for Windows / Linux /
macOS
2017-11-30 16:14:22 -05:00
Charlie Drage
94fb8b4d2d
Merge pull request #881 from cdrage/fix-makefile
Fix makefile
2017-11-30 15:22:42 -05:00
Charlie Drage
0fba8f44b1 Fix makefile
Fixes the makefile and uses sirupsen instead of sirupen.
2017-11-30 15:22:06 -05:00
Charlie Drage
42e7f0eecb
Merge pull request #878 from cdrage/update-conv
n -> ✓ for build v3 support
2017-11-30 10:05:00 -05:00
Charlie Drage
b953844cf3 n -> ✓ for build v3 support
✓ for build v3 support since we merged in
https://github.com/kubernetes/kompose/pull/846/
2017-11-30 10:04:26 -05:00
Charlie Drage
84be7400a2
Merge pull request #846 from surajnarwade/buildv3
Added support for build key in v3
2017-11-30 09:06:32 -05:00
Charlie Drage
995dff6690
Merge pull request #868 from surajnarwade/equal_up_convert
Adding `--controller` flag in `up` & `down`
2017-11-30 09:06:13 -05:00
Suraj Narwade
ada8af2410 Added functional test 2017-11-30 11:14:44 +05:30
Suraj Narwade
126d9820c4 Adding --controller flag in up & down
To make `kompose up` & `kompose convert` equal in feature, This PR will
add `--controller` flag for `kompose up` as well as `kompose down`
so that user experience will be the same for `up` & `convert`
Resolves #798

since we are adding `--controller` to `up` and `down`, So respective code to deploy and undeploy also being added for `daemonset` and `replicationcontroller`

Added tests for `--controller`
2017-11-27 15:26:24 +05:30
Suraj Narwade
b3f2134cec Updated Vendoring 2017-11-27 12:29:12 +05:30
Suraj Narwade
5de4aa85f8 Added sirupsen and updated all occurances
Updated `sirupsen`, `docker/cli`, `docker/libcompose` in `glide`,
Also changed `Sirupsen` with `sirupsen` in all kompose packages as well as in
`docker/distribution` packages
2017-11-27 12:28:46 +05:30
Suraj Narwade
d02492ad59 Updated Makefile with respective vendor-update commands 2017-11-27 12:28:32 +05:30
Charlie Drage
a194e59651
Merge pull request #875 from cdrage/update-conversion-docs
Update conversion doc for env_file
2017-11-22 12:02:27 -05:00
Charlie Drage
7496662ff3 Update conversion doc for env_file
Updates the conversion doc to indicate that we support env_file

Closes https://github.com/kubernetes/kompose/issues/873
2017-11-22 12:01:52 -05:00
Charlie Drage
999278fa0c
Merge pull request #874 from cdrage/release-1.5.0
1.5.0 Release
2017-11-21 11:22:57 -05:00
Charlie Drage
a2575df355 1.5.0 Release 2017-11-21 11:22:21 -05:00
Charlie Drage
a567cfff4a
Merge pull request #864 from cdrage/update-versions
Move version information to separate file
2017-11-21 07:40:56 -05:00
Charlie Drage
d7c515b0cb
Merge pull request #867 from abitrolly/master
Set PVC volume size with kompose.volume.size
2017-11-15 09:40:59 -05:00
Anatoli Babenia
1975c32740 Set service volume size with kompose.volume.size label (#235)
1. Copy labels from compose to kobject
2. If kompose.volume.size is set on service level, use it

Internal API changes:

- Add PVCSize to kobject Volumes struct
- Pass default volume size as CreatePVC() param
2017-11-12 13:05:55 +03:00
Charlie Drage
b6eddd7a7d
Merge pull request #862 from xianlubird/feature/ignore-links
Ignore links attribute and print warning message
2017-11-09 11:07:21 -05:00
Charlie Drage
ae11eb4e65
Merge pull request #866 from abitrolly/patch-1
architecture.md  Link sources
2017-11-08 09:17:45 -05:00
Anatoli Babenia
c8efd1511d
architecture.md Link sources 2017-11-08 13:01:00 +02:00
xianlubird
9b66188144 Ignore links attribute and print warning message
Signed-off-by: xianlubird@gmail.com
2017-11-08 10:08:12 +08:00
Charlie Drage
0f4bfebf08 Move version information to separate file
Moves the version information to a seperate file. This is mostly due to
import cycle errors occuring when using "import
github.com/kubernetes/kompose/cmd" in order to get the global variable
of VERSION and GITCOMMIT.

Update's the Makefile and other files accordingly.

If the version and commmit is unretriveable due to not being able to
find the kompose binary, the one from pkg/version/version.go will be
used.
2017-11-07 15:28:04 -05:00
Charlie Drage
fe62a96465
Merge pull request #863 from xianlubird/bug/typo
Fix typo
2017-11-07 12:16:46 -05:00
xianlubird
c717cbd65d Fix typo
Signed-off-by: xianlu <xianlu.cxl@alibaba-inc.com>
2017-11-07 17:39:44 +08:00
Charlie Drage
e7373ded2b
Merge pull request #861 from cdrage/update-docs-toc
Add TOC to documentation, add readme.md notice
2017-11-06 13:35:43 -05:00
Charlie Drage
e5b1f02b5e Add TOC to documentation, add readme.md notice
Adds TOC to architecture.md, getting-started.md, integrations.md and
user-guide.md

Updates README.md to add a notice that the files are best viewed on the
website.
2017-11-06 10:55:04 -05:00
Charlie Drage
c7964e71e7
Merge pull request #858 from cdrage/release-1.4.0
1.4.0 Release
2017-10-31 16:48:12 -04:00
Charlie Drage
79b5a02729 1.4.0 Release 2017-10-31 16:47:47 -04:00
Anush Shetty
7bb67675f4 Script for generating CLI tests:
* Made an entry in the Makefile: `make gen-cmd` will run the script now

* Added a section on adding CLI tests in development docs
2017-10-30 14:29:18 +05:30
Charlie Drage
7cd0635adb Merge pull request #819 from ashetty1/issue_781
Adding documentation for tests
2017-10-26 14:00:57 -04:00
Charlie Drage
393b3929a8 Merge pull request #852 from surajnarwade/update-help
Updated `--help` page for `kompose up`
2017-10-25 13:48:22 -04:00
Suraj Narwade
c7d6bc63d9 Added support for build key in v3
Resolves #636

This PR will add support for `build` in docker compose v3.
As https://github.com/docker/cli/pull/481 got merged now
2017-10-25 14:38:08 +05:30
Suraj Narwade
471578c92f Updated --help page for kompose up
This PR will add customhelp section in `kompose up --help` section,
which will show consistency in help section.
Issue reference: #842

for example,

```
$ kompose up --help
Deploy your Dockerized application to a container orchestrator. (default "kubernetes")

Usage:
  kompose up [flags]

OpenShift Flags:
      --build-branch             Specify repository branch to use for buildconfig (default is current branch name)
      --build-repo               Specify source repository for buildconfig (default is current branch's remote url
      --insecure-repository      Specify to use insecure docker repository while generating Openshift image stream object

Flags:
      --build string       Set the type of build ("local"|"build-config" (OpenShift only)|"none") (default "local")
  -h, --help               help for up
      --namespace string   Specify Namespace to deploy your application (default "default")
      --replicas int       Specify the number of replicas generated (default 1)
      --volumes string     Volumes to be generated ("persistentVolumeClaim"|"emptyDir") (default "persistentVolumeClaim")

Global Flags:
      --error-on-warning    Treat any warning as an error
  -f, --file stringArray    Specify an alternative compose file
      --provider string     Specify a provider. Kubernetes or OpenShift. (default "kubernetes")
      --suppress-warnings   Suppress all warnings
  -v, --verbose             verbose output
```
2017-10-13 18:03:33 +05:30
Charlie Drage
b4bbc4dbff Merge pull request #849 from piyush1594/readme-fix
Fix Redirecting Error in README.md
2017-10-12 10:28:45 -04:00
piyush
4d30969041 Fix Redirecting Error in README.md
Setup and Quickstart file are giving 404 as they were renamed
to installation and getting-started repectively.
Renamed the same in README.md to fix redirecting.
Fixes #845
2017-10-12 14:12:08 +05:30
Charlie Drage
2fb357baa3 Merge pull request #848 from cdrage/update-site-gen
Redirects not working
2017-10-11 14:20:24 -04:00
Charlie Drage
24a85684cd Redirects not working
Due to not adding a trailing `/` redirects were not working.

For example, going to kompose.io/docs/user-guide.md will appear as
plaintext html, adding a trailing / creates an index.html in the
directory and correctly redirects the user.
2017-10-11 14:18:48 -04:00
Charlie Drage
cfbc83a8ea Merge pull request #847 from piyush1594/redirecting-fixes
Fix Redirecting Error
2017-10-11 12:05:22 -04:00
piyush
5c8d831b02 Fix Redirecting Error
This wil fix the redirecting issue to quickstart in integrations.md
and to kompose installation in maven-example.md
Fixes #844
2017-10-11 20:54:50 +05:30
Anush Shetty
d040121939 Adding documentation for tests 2017-10-11 19:58:53 +05:30
Charlie Drage
903acfdbbf Merge pull request #836 from piyush1594/docs-update
Added Fabric8 Maven Plugin in Integration
2017-10-10 15:57:23 -04:00
Charlie Drage
4f187a13d7 Merge pull request #843 from cdrage/release-1.3.0
1.3.0 Release
2017-10-10 15:25:37 -04:00
Charlie Drage
c27bbc223c 1.3.0 Release 2017-10-10 15:24:44 -04:00
Charlie Drage
93bde02d5a Merge pull request #841 from cdrage/update-release-script-4
Update version number in introduction.md
2017-10-10 15:03:03 -04:00