Commit Graph

1000 Commits

Author SHA1 Message Date
Charlie Drage
449bc3a229 Update widgets (add godoc) as well as README
Update the widgets (as well as add godoc), and update the README, making
the `kompose completion` section more concise.
2017-06-14 10:16:31 -04:00
Abhishek
c40bb4bb3a change volume name with generated deployment file
if volumes in docker file is defined as
      volumes:
        - .:/code
    Then the PVC created by kompose will containes .(dot) in it.
       .-persistentvolumeclaim.yaml
2017-06-14 14:31:07 +05:30
Tomas Kral
bf20029009 Merge pull request #631 from procrypt/sort_EnvVar_struct
Fix EnvSort struct
2017-06-14 09:53:23 +02:00
Tomas Kral
2866792b5d Merge pull request #637 from cdrage/add-index
Add documentation list
2017-06-14 09:29:08 +02:00
Abhishek
719dae97e4 Environment variabled are populated in random order, causing functional tests in golang #518 to fail 2017-06-14 12:58:56 +05:30
Tomas Kral
89cf88f665 Merge pull request #638 from surajnarwade/show-diff
Failing test will show diff
2017-06-14 09:28:30 +02:00
Suraj Deshmukh
3be76ff32b Merge pull request #600 from cdrage/add-v3-support
Add v3 support of Docker Compose
2017-06-14 10:59:05 +05:30
Charlie Drage
2b58307191 Add v3 support
This does a major refactor on the compose.go functions as well as brings
in a new era of v3 support to Kompose.

Similar to how we utilize libcompose, we utilize docker/cli's "stack
deploy" code which has a built-in v3 parser. We convert the parsed
structure to our own and then convert it to Kubernetes/OpenShift
artifacts.
2017-06-13 09:44:48 -04:00
Suraj Narwade
883d11c049 Failing test will show diff
If test in `make test-cmd` is failing, now it will show diff so that
it will be easy to debug.

for example,

```
===> Starting test <===
convert::expect_success_and_warning: Running: 'kompose -f /home/snarwade/go/src/github.com/kubernetes-incubator/kompose/script/test/fixtures/service-name-change/docker-compose.yml convert --stdout -j' expected_output: '/home/snarwade/go/src/github.com/kubernetes-incubator/kompose/script/test/fixtures/service-name-change/output-k8s.json' expected_warning: 'Unsupported root level volumes key - ignoring'
WARN Unsupported root level volumes key - ignoring
WARN Unsupported depends_on key - ignoring
103c103
<                     "value": "bitnami_wordpres"
---
>                     "value": "bitnami_wordpress"
FAIL: converted output does not match
```
2017-06-13 14:20:52 +05:30
Charlie Drage
9360513a51 Add documentation list
Adds an "index" with a list of all documentation on the README.md
2017-06-12 10:52:07 -04:00
Tomas Kral
dbf15e2e71 Merge pull request #635 from cdrage/update-docs
Change output examples in docs to new format
2017-06-12 09:56:30 +02:00
Charlie Drage
f7e81ab7e0 Change output examples in docs to new format
Changes the format from INFO to INFO <PROVIDER> in output examples.
2017-06-09 12:42:33 -04:00
Tomas Kral
aa84680d6e Merge pull request #588 from ashetty1/kompose_labels_test
Adding tests for kompose-specific labels and buildconfig dockerfile construct
2017-06-08 15:09:51 +02:00
Charlie Drage
683ae91823 Update vendoring 2017-06-07 10:23:50 -04:00
Charlie Drage
f066834e3d Merge pull request #630 from cdrage/remove-jekyll-format
Remove jekyll format from top of quickstart
2017-06-02 11:48:35 -04:00
Charlie Drage
6d8ba322f0 Remove jekyll format from top of quickstart
Left this in while adding docs/quickstart.md by accident
2017-06-02 11:24:00 -04:00
Charlie Drage
033886c573 Merge pull request #629 from cdrage/update-release-script-againn
Fix adding Jekyll format to the top
2017-06-02 10:14:14 -04:00
Charlie Drage
b76ed55f82 Fix adding Jekyll format to the top
Problem with `/permalink/`. This adds a few bash lines that updates
index.md without the permalink.
2017-06-02 10:05:18 -04:00
Tomas Kral
60f46fc65e Merge pull request #628 from cdrage/update-docs-with-index
Update documentation to reflect quickstart
2017-06-02 13:14:54 +02:00
Tomas Kral
5939158b57 Merge pull request #616 from cdrage/files-to-files
Add provider to file output
2017-06-02 13:12:26 +02:00
Charlie Drage
ea95f0a912 Update documentation to reflect quickstart
Adds quickstart.md from the kompose.io site as well as incorporates
changes so that you can update the index page of Kompose.io via
quickstart.md
2017-06-01 15:35:05 -04:00
Charlie Drage
1f0cf0b2e1 Merge pull request #609 from surajnarwade/validate_dockerfilepath
Validate dockerfilepath in buildconfig
2017-05-31 13:13:04 -04:00
Suraj Deshmukh
a35d5965b5 Merge pull request #617 from gitlawr/add_pid
add support for "pid" key. Fixes #610
2017-05-31 21:36:54 +05:30
gitlawr
1485ed4479 add support for "pid" key
solve #610
convert service.pid to Pod.Spec.HostPid
set Pod.Spec.HostPid to true if service.pid ="host", to false otherwise
update conversion.md on support for the key
2017-05-31 22:39:17 +08:00
Anush Shetty
fb0966f9e3 Changes to make the tests work with emptyvols 2017-05-31 15:59:52 +05:30
Charlie Drage
a6df28f98d Merge pull request #622 from cdrage/update-readme
Update README with only docker compose example
2017-05-30 08:33:48 -04:00
Charlie Drage
1f36e28eb5 Update README with only docker compose example
At the moment, `dabs` don't seem to work as well as the fact that there
hasn't been much development since the experimental announcement of the
DAB format.

Removing it from the README makes the example clearer as well as more
direct / informative.
2017-05-30 08:33:21 -04:00
Suraj Narwade
581e181967 Validate dockerfilepath in buildconfig
This PR will resolve #594 by validating dockerfilepath based on whether
it is relative path or not.
2017-05-30 16:31:20 +05:30
Suraj Deshmukh
2a708bcdcf Merge pull request #615 from cdrage/update-table
Remove version column from conversion document
2017-05-30 15:37:30 +05:30
Anush Shetty
b48b250de2 Merge remote-tracking branch 'upstream/master' into kompose_labels_test 2017-05-30 15:11:22 +05:30
Charlie Drage
a82ab15765 Remove version column from conversion document
Removes the version column in order to expand the width of the
conversion document as well as indicate that the table expands on ALL
versions (1,2,3)
2017-05-29 10:06:12 -04:00
Charlie Drage
c25b7e88d0 Merge pull request #619 from cdrage/master
0.7.0 Release
2017-05-25 12:06:41 -04:00
Charlie Drage
4da352210c 0.7.0 Release 2017-05-25 12:05:54 -04:00
Charlie Drage
7fe1358919 Merge pull request #618 from cdrage/update-release-scripts
Update version number in setup.md file in release script
2017-05-25 11:41:54 -04:00
Charlie Drage
270d9e779b Update version number in setup.md file in release script
This change updates setup.md to include the new version number when
doing a release.
2017-05-25 11:41:02 -04:00
Anush Shetty
5f34c7368c Merge remote-tracking branch 'upstream/master' into kompose_labels_test 2017-05-25 12:19:02 +05:30
Anush Shetty
d2ad889367 Merge remote-tracking branch 'origin/master' into kompose_labels_test 2017-05-25 12:18:29 +05:30
Anush Shetty
43fa4a3fa6 Adding tests for kompose-specific labels and buildconfig dockerfile construct
* Two new scripts testing kompose-specific labels have been added:
	script/test_in_openshift/tests/routes-service-expose-hostname.sh
	script/test_in_openshift/tests/routes-service-expose-true.sh

* Tests for buildconfig dockerfile construct has been added:
	script/test_in_openshift/tests/buildconfig_dockerfile.sh

* Tests for restart option:
	script/test_in_openshift/tests/restart-options.sh

* Ability to run individual scripts: Changes have been made to script/test_in_openshift/run.sh
  for running individual scripts:

	Eg. ./script/test_in_openshift/run.sh script/test_in_openshift/tests/routes-service-expose-true.sh
2017-05-25 12:04:51 +05:30
Charlie Drage
93f5c0103c Merge pull request #613 from kadel/fix-ImageStream-tag
Fix incorrect tag in BuildConfig.
2017-05-23 15:13:34 -04:00
Charlie Drage
cb30bd5f51 Add provider to file output
Adds the provider name to the file output. For example:

```sh
INFO OpenShift file "frontend-service.yaml" created
INFO OpenShift file "redis-master-service.yaml" created
INFO OpenShift file "redis-slave-service.yaml" created
INFO OpenShift file "frontend-deploymentconfig.yaml" created
INFO OpenShift file "frontend-imagestream.yaml" created
INFO OpenShift file "redis-master-deploymentconfig.yaml" created
INFO OpenShift file "redis-master-imagestream.yaml" created
INFO OpenShift file "redis-slave-deploymentconfig.yaml" created
INFO OpenShift file "redis-slave-imagestream.yaml" created
```
2017-05-23 15:08:50 -04:00
Charlie Drage
8938fa13f5 Merge pull request #608 from gitlawr/stop_grace_period
Add support for stop_grace_period
2017-05-23 14:42:29 -04:00
Tomas Kral
c5fa9f7f2a
Fix incorrect tag in BuildConfig.
For services with build and image keys DeploymentConfig respects tag from docker-compose image key.
But BuildConfig image tag was always set to  'latest'.
Result of this was that deployment wasn't trigired after successful build.
This fixes it by setting BuildConfig output image tag to the same tag that is used for  DeploymentConfig (tag from docker-compose image key)
2017-05-23 14:05:59 +02:00
gitlawr
c01f6f1763 To solve #440
This commit Add support for stop_grace_period which maps to
Pod.Spec.TerminationGracePeriodSeconds
Updated conversion.md on support for the key
2017-05-23 12:03:14 +08:00
Tomas Kral
f097b35854 Merge pull request #612 from cdrage/fix-output-completion
Update `kompose completion`
2017-05-22 12:55:05 +01:00
Charlie Drage
1cacfddf1a Update kompose completion
Updates Kompose completion with neutral language (using shell instead of
bash).

Fixes the indentation issues when outputting `kompose completion --help`
2017-05-19 10:27:11 -04:00
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