Commit Graph

525 Commits

Author SHA1 Message Date
Ratnadeep Debnath
e83b454536 Bugfix: Accept abs path for compose file for buildconfig.
Change directory to compose file dir when resolving git remote.
2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
bea50b1608 Fix tests for buildconfig. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
1a7b19c070 Resolve/print buildconfig source repo info globally for compose project. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
f5566d4097 Improve error handling and logging for openshift buildconfig creation.
- Error out on failure to create buildconfig, with meaningful error messages, e.g., git missing, error in fetching git remote, error in creating build context, etc.
- Add info log for build repo/branch being used.
2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
6f3e670af1 Refactor openshift buildconfig CLI options.
- Remove --buildconfig, -bc option. Create buildconfig if service has build info
- Rename --branch to --build-branch
- Rename --repo to --build-repo
2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
fa724fe12d Allow specifying repo,branch info for buildconfig over CLI. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
a9241e6fe5 Added example for openshift buildconfig. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
9e2849addf In Openshift, don't create imagestream tags for a service with build diretive. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
6156d144f2 Fix generating project source repo URL in openshift buildconfig. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
efc5203d82 Fix creating build context dir relative to project root dir. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
f46274be38 In buildconfig, remove trailing newline from project's remote git repu URL. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
6d8a6a3fc8 In buildconfig, only set strategy type as Docker
and do not set other details like imagestream to build from, etc.
2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
a2a731f30c Generate context path relative to project root dir in buildconfig. 2016-12-28 17:00:33 +05:30
Ratnadeep Debnath
1215a6366e Updated Godeps and vendors.
Added:
- github.com/openshift/origin/pkg/build/api/install
- github.com/openshift/origin/pkg/build/api/v1
2016-12-28 17:00:32 +05:30
Ratnadeep Debnath
92b6678d1b Initial implementation of BuildConfig support for Openshift provider. 2016-12-28 17:00:32 +05:30
Suraj Deshmukh
c80735c1a5 Merge pull request #350 from containscafeine/stdin_tty
add stdin_open, tty support, add tests, fix #344
2016-12-28 16:18:25 +05:30
Shubham Minglani
6a151c6267 add stdin_open, tty support, add tests, fix #344
This adds supports for stdin_open: bool and
tty: bool support for kubernetes and openshift
providers in kompose. This maps to the
template.Spec.Containers[0].Stdin and
template.Spec.Containers[0].TTY in Kubernets
world.

Also, added tests.

Fixes #344
2016-12-28 15:58:45 +05:30
Suraj Deshmukh
0370d66357 Merge pull request #347 from surajssd/up_down_no_validation_needed
Flag validation called on up and down
2016-12-27 17:55:02 +05:30
Suraj Deshmukh
5625a97833 Flag validation called on up and down
On kompose up and kompose down flag validation
was done which is validating flags that are not there
in kompose up and kompose down
2016-12-27 15:59:07 +05:30
Suraj Deshmukh
73418310ac Merge pull request #304 from cdrage/switch-to-cobra
Switch to spf13/cobra from urfave/cli
2016-12-26 12:34:07 +05:30
Charlie Drage
1fdc1f648e Update vendoring 2016-12-22 09:18:22 -05:00
Charlie Drage
1b9228e696 Switch to spf13/cobra from urfave/cli
There's A LOT happening in this commit, so here's an outline:

First off, urfave/cli has been removed in favour of spf13/cobra. With
this, comes changes to the formatting as well as the help page for
Kompose.

Upon converting, I noticed a CLI flag was NOT appearing for OpenShift.
Specifically, --deploymentconfig. This has been added with a note
that says it is OpenShift only.

Exit codes have been fixed. If the conversion / down / up fails for
any reason, Kompose will exit with Code 1.

--verbose as well as --suppress-warnings can now be set at the
same time.

app_test.go in the cli directory has been moved to pkg/transformer
to better reflect the testing coverage.

version.go has been removed and converted to it's own CLI command in
conjuction with (most) Go software. A new CLI command has been
created. kompose version

--dab isn't a conventional way for short-form CLI paramters. This
has been shortened to -b for bundle.

CLI flags consisting of only two/three letters have been removed due to
it being unconventional for CLI. For example, --dc was removed in preference
for --deploymentconfig

--replicas has been added as an option when using kompose down or
kompose up. This has been added as previously in app.go the
replica amount was hard-coded as 1.

Differentiating names have been used for flags. For example,
persistent flags use the name Global (ex. GlobalOut). Command-specific
flags have their own names (ex. UpOpt).

Closes #239 #253
2016-12-22 08:15:51 -05:00
Suraj Deshmukh
240f150492 Merge pull request #285 from containscafeine/expose_service
expose service to outside, fix #140
2016-12-22 17:13:52 +05:30
Shubham Minglani
7e378cd546 implement expose service, add tests, fix #140
Implements a kompose specific docker compose label "kompose.service.expose" which can be used to expose the specified services externally. The accepted values are of type string.
If the value is set to "true", the provider sets the endpoint automatically, and for any other value, the value is set as the hostname. If multiple ports are defined in a service, the first one is chosen to be the exposed.

Unit tests, functional tests, glide updates and docs have also been added in this commit for the related feature.
2016-12-21 20:00:38 +05:30
Suraj Deshmukh
48e3ba88cd Merge pull request #324 from rtnpro/unsupported-keys-per-provider
Unsupported keys per provider
2016-12-21 19:08:42 +05:30
Suraj Deshmukh
5ddd48ee63 Merge pull request #337 from containscafeine/output_file_dir
implement storing to directory or file, add functional tests
2016-12-21 18:22:45 +05:30
Shubham Minglani
365fe81987 implement storing to dir/file, add tests
When kompose convert -o artifacts is run, then if artifacts is a directory,
kompose stores all the resulting files inside it, and if it's not a directory,
it stores the artifacts in a single file.

Fixes #209
2016-12-21 18:12:43 +05:30
Tomas Kral
3419ae7fe1 few updates based on review 2016-12-20 16:58:28 +05:30
Tomas Kral
af9c6585ee Add tests for unsupported keys in k8s transformer 2016-12-20 16:58:28 +05:30
Tomas Kral
d5d0a3f03a Add tests for unsupported keys in loaders 2016-12-20 16:58:23 +05:30
Tomas Kral
841141ad64 Fix functional tests for unsupported keys 2016-12-20 12:21:53 +05:30
Tomas Kral
f20e6f3fa9 checkUnsupportedKeys for transformers 2016-12-20 12:21:52 +05:30
Tomas Kral
e4f9b59b4d Separate unsupported key check for every loader 2016-12-20 12:21:03 +05:30
Suraj Deshmukh
c485a870d8 Merge pull request #317 from ngtuna/env-key-only
support parse key-only environment variable
2016-12-19 22:51:06 +05:30
Tuna
7556f6f9fa add unit test for loadEnvVar 2016-12-19 11:23:42 +01:00
Tuna
a881f5cca0 add test for key-only env 2016-12-19 11:23:42 +01:00
Tuna
000ed33cb1 support parse key-only environment variable
fix #303
2016-12-19 11:23:42 +01:00
Chris Baumbauer
072d4815ee #231 Invoking kompose --bundle X.dab convert --stdout will produce two differently ordered results (#338) 2016-12-18 09:01:42 -05:00
Suraj Deshmukh
7bda857079 Merge pull request #340 from surajssd/update_broken_master
update vendored dependencies
2016-12-16 20:42:59 +05:30
Suraj Deshmukh
10299eb5dc update vendored dependencies 2016-12-16 18:04:46 +05:30
Suraj Deshmukh
4dd31da6e4 Merge pull request #319 from kadel/glide
Switch from godep to glide
2016-12-16 13:40:40 +05:30
Suraj Deshmukh
78845d3954 Merge pull request #334 from surajssd/create_pod
support for raw pod output without controller
2016-12-15 11:57:13 +05:30
Suraj Deshmukh
8676ae8ae4 Merge pull request #280 from procrypt/down
added support for OpenShift down
2016-12-15 11:53:38 +05:30
Abhishek
6ad54a36e2 added support for OpenShift down 2016-12-15 11:06:00 +05:30
Suraj Deshmukh
6ea5f72e40 support for raw pod output
if a user specifies a docker-compose service
with restart value as "no" or "on-failure"
then normal pod will be created as against
to a controller and a pod.
2016-12-13 19:24:25 +05:30
Tomas Kral
65e19e3105 Merge pull request #333 from cdrage/namespace-bug
Fix container_name incorrectly being generated
2016-12-12 18:17:52 +01:00
Charlie Drage
ee2946c810 Fix container_name incorrectly being generated
Checks to see if "container_name" is used correctly in a docker-compose
file conversion and updates the changes respectively in the outputted
artifact files.

For example with container_name set as myfoobarname, the change will
correctly update the "containerNames" portion of the deployment-config
for OpenShift.

"imageChangeParams": {
  "automatic": true,
  "containerNames": [
    "myfoobarname"
  ],
  "from": {
    "kind": "ImageStreamTag",
    "name": "rabbit:3.6.1"
  }
}

Closes https://github.com/kubernetes-incubator/kompose/issues/301
2016-12-08 13:49:11 -05:00
Tomas Kral
04a3131834 Merge pull request #332 from kubernetes-incubator/kadel-patch-1
Update RPM instalaion instructions in README.md
2016-12-08 14:48:49 +01:00
Tomas Kral
25200cf418 Update README.md 2016-12-07 20:20:20 +01:00
Tomas Kral
a0ba435efb
Add check-vendor script
This checks vendor dir for nested vendors
and if vendor has been cleaned by glide-vc
2016-12-07 19:57:47 +01:00