Commit Graph

705 Commits

Author SHA1 Message Date
Suraj Deshmukh
1c64b016dc Merge pull request #592 from cdrage/change-git-command
Use old git command
2017-05-18 09:12:09 +05:30
Suraj Deshmukh
22fe5997e2 Merge pull request #606 from achanda/underscores
Replace underscores with dashes while rendering container names
2017-05-17 18:18:01 +05:30
Tomas Kral
dbceb2d2a8 Merge pull request #578 from kadel/add-label
Add io.kompose.service label to every object & use reaper to delete BuildConfig
2017-05-17 12:40:51 +01:00
Abhishek Chanda
9ebfa9e293 Replace underscores with dashes while rendering container names
Kubernetes container names must match the regex [a-z0-9]([-a-z0-9]*[a-z0-9])?
This excludes underscores, which is common in container names in compose.
2017-05-17 07:31:33 +00:00
Tomas Kral
166eedfc1c
update vendor
added files required by BuildConfig reaper
2017-05-16 17:56:38 +02:00
Tomas Kral
bee784faf6
Use BuildConfig reaper to delete BuildConfig with all related pods 2017-05-16 17:56:38 +02:00
Tomas Kral
792976da1f
some of created objects were missing io.kompose.service label
label added to BuildConfig, DaemonSet, ReplicationController, Deployment and Pod
2017-05-16 17:56:32 +02:00
Suraj Deshmukh
7e785bb31f Merge pull request #424 from surajnarwade/add-build-args
Add build_args support in buildconfig Fixes #406
2017-05-16 13:46:06 +05:30
Suraj Narwade
8fc262bd99 Add build_args support in buildconfig
now args provided under build in docker-compose file can be available in buildconfig.
it solves #406
Added unit test and functional test
solves #445
Separated key:"value" pairs by spaces
2017-05-16 12:19:00 +05:30
Suraj Deshmukh
b877014380 Merge pull request #602 from surajssd/remove-duplicate-import
remove duplicate import with different name
2017-05-15 22:11:06 +05:30
Charlie Drage
8edb851b9c Merge pull request #601 from surajnarwade/update-vendoring
Updated Vendoring
2017-05-15 12:04:46 -04:00
Suraj Deshmukh
f7a78edeae remove duplicate import with different name
`k8s.io/kubernetes/pkg/api` is imported directly and once with the alias
import name `kapi` so remove the original import and keep the aliased with
`kapi` one and also replace the code bits which call it with `api` name.
2017-05-15 21:12:05 +05:30
Suraj Narwade
7f00fec328 Updated Vendoring
It resolves issues #474 and #589 which were coming from libcompose,
as well as resolves #440 and #437 partially as `group_add` & `stop_grace_period`
are supported by libcompose now.
2017-05-15 18:28:03 +05:30
Suraj Deshmukh
7ddce35dd5 Merge pull request #597 from cdrage/update-docs-2
<docs> Update version number
2017-05-15 14:40:20 +05:30
Charlie Drage
4e051c2cb6 <docs> Update version number
Updates version number within setup installation instructions for docs
2017-05-10 11:05:47 -04:00
Charlie Drage
f66a11fd70 Merge pull request #565 from procrypt/ux
sort output when creating kubernetes/openshift objects
2017-05-10 09:21:05 -04:00
Abhishek
529e6c674f sort output when creating kubernetes/openshift objects 2017-05-09 23:56:54 +05:30
Charlie Drage
f0c4addbaf Use old git command
Some versions of git don't have git-url (case in point on Debian 8, no
get-url on packaged git).

Use old command in getting URL.
2017-05-09 08:55:55 -04:00
Suraj Deshmukh
ebd9dcf207 Merge pull request #577 from surajnarwade/fix-build-test
Fixes fixture test for build context
2017-05-09 17:09:55 +05:30
Suraj Narwade
aacde86eb9 Fixes fixture test for build context
Resolves #576

This PR includes `output-os-template.json` in `nginx-node-redis` example,
which is basically output template contains `%URI%` and `%REF%` variables
which will be filled while initializing test cases and new will be stored as
`/tmp/output-os.json`
This will remove the problem of git uri and ref.
2017-05-08 17:54:24 +05:30
Charlie Drage
b3570e0da5 Merge pull request #586 from surajssd/fix-broken-link-to-fedora
Fix link to fedora setup in docs
2017-05-03 12:57:18 -04:00
Suraj Deshmukh
fa255d2c78 Fix link to fedora setup in docs 2017-05-03 18:37:07 +05:30
Tomas Kral
abf81926c0 Merge pull request #460 from ashetty1/openshift_up_down_test
Adding kompose up/down tests for openshift
2017-05-02 13:35:55 +02:00
Tomas Kral
a2cff3e11a Merge pull request #583 from cdrage/update-it-again
Release script binary upload bug
2017-05-02 13:02:47 +02:00
Anush Shetty
1b3d876a62 Adding OpenShift functional tests for kompose up/down
* This PR adds functional tests for kompose up/down. The test scripts
are hosted under script/test_in_openshift. The directory structure,
as follows:

	script/test_in_openshift/
	├── compose-files
	│   └── docker-compose-command.yml
	├── lib.sh
	├── run.sh
	└── tests
		├── buildconfig.sh
    		├── entrypoint-command.sh
    		├── etherpad.sh
    		└── redis-replica-2.sh

* script/test_in_openshift/run.sh is the master script
  which executes all the tests

* script/test_in_openshift/lib.sh consists of helper functions
  for `kompose up` and `kompose down` checks

* script/test_in_openshift/tests directory consists of test scripts

* The scripts use 'oc cluster up' for setting up a single-machine
  OpenShift cluster. It exits if oc binaries are not installed

* Most of the docker compose files used are the ones already
  available in examples/ or script/test/fixtures.

* How to run the tests: 'make test-openshift'
2017-05-02 12:02:30 +05:30
Charlie Drage
ef627eef1c Release script binary upload bug, tarball bug
Removes the '$CLI' portion of uploading the binaries / tarballs. Had a
naming error when uploading.

Updates it so we cd to `bin` so we can create the tarballs without the
`/bin` folder being located within it.
2017-04-28 10:44:47 -04:00
Charlie Drage
ae4ef9e794 Merge pull request #582 from cdrage/release-0.6.0
0.6.0 Release
2017-04-28 10:01:03 -04:00
Charlie Drage
0bc69a487f 0.6.0 Release 2017-04-28 09:46:54 -04:00
Charlie Drage
0f92e3fe57 Merge pull request #581 from cdrage/update-release-script-make-it-great-again
Update the release script again
2017-04-28 09:45:43 -04:00
Charlie Drage
f64ad32ae9 Update the release script again
Updates the release script to use the actual GOPATH directory as
previous problems with commit hashes / versions in `kompose version`.

Cleans this up in regards to all the `cd` and `cd ..` commands.

No need to `git clone`.
2017-04-28 09:43:40 -04:00
Charlie Drage
0acfc20f72 Merge pull request #580 from gitlawr/supportCap_add_drop
Add Support for cap_add & cap_drop
2017-04-28 09:31:10 -04:00
Tomas Kral
0d3a7084c2 Merge pull request #567 from cdrage/add-spacing-to-table
Adds spacing to table
2017-04-28 11:44:40 +02:00
gitlawr
3916eb9f60 Fixes #575
This commit Add support for cap_add & cap_drop which maps to
Pod.Spec.Container.SecurityContext.Capabilities.Add/Drop
Added unit tests for ConfigCapabilities function
Updated conversion.md on support for these keys
2017-04-28 14:41:12 +08:00
Suraj Deshmukh
e658c70178 Merge pull request #454 from surajnarwade/fix_build_context
Added consistency in build context
2017-04-27 23:23:59 +05:30
Suraj Narwade
1eb162d697 Updated Vendoring 2017-04-27 21:38:38 +05:30
Suraj Narwade
605d643a84 Adding code for consistent build context
fixes #445

This PR was partially fixed by docker/libcompose#450, which now gives consistent build context,
also it modifies the function getAbsBuildContext to create accurate build context, Unit test are being modified
according to new structure.
2017-04-27 21:38:38 +05:30
Tomas Kral
760d47b022 Merge pull request #579 from cdrage/update-roadmap-3
Update PR for ROADMAP
2017-04-27 16:18:47 +02:00
Charlie Drage
a673caf753 Update PR for ROADMAP
We're going to have push/pull support in 0.7.0
2017-04-27 09:40:33 -04:00
Tuna
65c9cf9bd8 Merge pull request #557 from procrypt/driver_local
fix driver:local in prefixing volumes with current dir name
2017-04-27 15:25:50 +07:00
Abhishek
7eccb37c19 fix driver:local in prefixing volumes
If we have a docker-file with root level volumes and we do a kompose up
using that docker-file, libcompose will add an additional _ followed by
the current directory name. Since kubernetes doesn't allow _ in the
objects created so kompose up will fail to deploy it. As a solution we
replace _ to - and we can then deploy it successfully.
2017-04-26 20:14:22 +05:30
Charlie Drage
079fad5c54 Merge pull request #569 from procrypt/update_doc
Add warning about change in the service name.
2017-04-26 10:37:57 -04:00
Charlie Drage
05a408925c Merge pull request #553 from surajnarwade/minor_fix
Updated conversion doc
2017-04-26 10:35:39 -04:00
Abhishek
30e39e094c Add warning about change in the service name of docker-compose file that contains _ in it to - 2017-04-26 19:53:57 +05:30
Suraj Narwade
9f849fbbb7 Updated conversion doc
Solves #548

`docs/conversion.md` is updated as `tmpfs` is supported now.
2017-04-26 19:19:55 +05:30
Charlie Drage
60a637593c Merge pull request #570 from procrypt/typo
typo in nginx name.
2017-04-25 12:40:44 -04:00
Abhishek
ec85012a8c typo in nginx name 2017-04-25 11:14:35 +05:30
Charlie Drage
f1d2268030 Merge pull request #568 from nkysg/master
fix output replication-controller and daemon-set
2017-04-24 09:05:46 -04:00
mi
edc2be4353 fix output replication-controller and daemon-set 2017-04-24 10:02:05 +08:00
Charlie Drage
eb77221ca0 Adds spacing to table
Adds some spacing to the table to better separate each section.
2017-04-21 11:35:09 -04:00
Suraj Deshmukh
d24879f881 Merge pull request #559 from cdrage/update-tarball-readme-clarify
Clarify tarball
2017-04-21 16:06:09 +05:30