Commit Graph

705 Commits

Author SHA1 Message Date
Tomas Kral
c1b3a54bf9 Merge pull request #485 from cdrage/update-link-to-conversion-doc
Update the link to the conversion doc
2017-03-14 14:11:26 +01:00
Tomas Kral
488f34bb1a Merge pull request #488 from cdrage/add-release-notes
Add three-week cycle comment to README
2017-03-14 13:50:16 +01:00
Charlie Drage
3e37d248a4 Add three-week cycle comment to README
This adds a comment about our three-week cycle to the README.md.
2017-03-13 11:38:31 -04:00
Charlie Drage
d210c7faf4 Update the link to the conversion doc
This updates user-guide.md to link to conversion.md when talking about
unsupported keys used by Kompose.
2017-03-10 14:23:59 -05:00
Tomas Kral
e631960894 Merge pull request #465 from cdrage/update-release-script-resync
Update release script
2017-03-03 17:46:26 +01:00
Charlie Drage
4e3b1c34d7 Update release script
Had an issue where I don't git pull / merge with master after the PR has
been merged.

This adds an option to sync with master before continuing.
2017-03-03 10:48:50 -05:00
Tomas Kral
96cfc3c506 Merge pull request #468 from kadel/cap
Add cap_add and cap_drop to unsupported keys
2017-03-02 19:21:29 +01:00
Charlie Drage
a6aec65190 Merge pull request #448 from cdrage/add-compatibility-table
Add conversion documentation
2017-03-02 09:54:41 -05:00
Tomas Kral
de797643ae Merge pull request #466 from cdrage/update-user-guide
Minor fix on user guide
2017-03-02 15:49:42 +01:00
Charlie Drage
40a9fbc8e7 Add conversion documentation
This adds a document regarding all the values which are converted from
Docker Compose to Kubernetes / OpenShift. Adding both notes as well as
the value that docker-compose is mapped to in Kubernetes / OpenShift.
2017-03-02 09:17:49 -05:00
Tomas Kral
8b66473edd
Add cap_add and cap_drop to unsupported keys 2017-03-02 14:54:52 +01:00
Charlie Drage
e2fd803a3b Minor fix on user guide 2017-03-02 08:22:37 -05:00
Tomas Kral
fe632d9d39 Merge pull request #459 from procrypt/unsupported_keys
unsupported keys
2017-03-02 13:57:46 +01:00
Abhishek
a539e44d94 unsupported keys 2017-03-02 11:09:31 +05:30
Tomas Kral
84dba65a2d Merge pull request #455 from cdrage/update-logrus
Clean up logrus
2017-03-01 15:18:24 +01:00
Charlie Drage
c0043ebd11 Clean up logrus
Replaces "log" from "logrus" as commonly used in large Go projects.

Makes it easier from a developer perspective to use `log.Info`,
`log.Debug`, etc.
2017-02-27 10:53:24 -05:00
Tomas Kral
e555e74a1d Merge pull request #453 from cdrage/update-readme-with-new-go-update
Update the README with -u in go get
2017-02-27 16:04:30 +01:00
Charlie Drage
13b6c3dbd1 Update the README with -u in go get
Updates the readme to include -u in `go get` in order to upgrade
already-installed versions of Kompose.
2017-02-27 09:56:07 -05:00
Charlie Drage
88b10b257f Merge pull request #451 from cdrage/update-release-script-again-2
Update the release script again :)
2017-02-24 14:03:20 -05:00
Charlie Drage
7e7a01a91a Update the release script again :) 2017-02-24 10:07:23 -05:00
Charlie Drage
135165b39c Merge pull request #450 from cdrage/release-0.3.0
0.3.0 Release
2017-02-24 09:56:16 -05:00
Charlie Drage
10cff91295 121011e Release 2017-02-24 09:45:28 -05:00
Charlie Drage
121011ebc0 Merge pull request #449 from kadel/multiple-go-versions
Test with multiple go versions
2017-02-24 09:36:44 -05:00
Tomas Kral
b1cb6cdb80
update tags to make go vet 1.8 stop complaining 2017-02-24 15:16:47 +01:00
Tomas Kral
dd941beec7
test go 1.7 and 1.8 2017-02-24 13:09:16 +01:00
Charlie Drage
082bd17dce Merge pull request #434 from procrypt/abstract_out_api.PodSpec
Abstract out api.pod spec
2017-02-22 10:47:30 -05:00
Tomas Kral
34884169af Merge pull request #414 from cdrage/add-mem-limit
Adds mem_limit support for conversion
2017-02-22 16:05:46 +01:00
Abhishek
082e2351a0 abstract_out_api.PodSpec 2017-02-22 20:25:55 +05:30
Charlie Drage
858314e06b Adds mem_limit support for conversion
This commit adds mem_limit support. Taking the value from
docker-compose.yaml and converting it to it's associative value in
Kubernetes artifacts.

Closes (half) of
https://github.com/kubernetes-incubator/kompose/issues/267
2017-02-22 08:19:27 -05:00
Suraj Deshmukh
786f5c4f99 Merge pull request #378 from containscafeine/deployment_strategy
change strategy to recreate if volumes present, fix #264
2017-02-21 13:37:06 +05:30
Shubham Minglani
b73efa54f2 set strategy to Recreate if vols, add tests,docs
When volumes are specified in the Docker Compose
files, then in case of Kubernetes, Deployment's
Spec.Strategy.Type and in case of OpenShift,
DeploymentConfig's Spec.Strategy.Type are set to
"Recreate". This is a safer deployment strategy
when Volumes are getting used.

This commit also adds unit tests for Kubernetes
as well as OpenShift, and fixes the failing
functional tests (tests.sh) due to the change.

No functional tests have been added since
the functionality is already covered when the
volume mounts are being tested earlier in the
file.

This fixes #264
2017-02-20 11:44:43 +05:30
Tomas Kral
fb042c7b20 Merge pull request #428 from surajssd/remove_unnecessary_objects
removed unnecessary objects in compose.go
2017-02-15 11:29:57 +01:00
Tomas Kral
e0634302d0 Merge pull request #425 from cdrage/update-libcompose-vendoring
Update vendoring
2017-02-15 11:23:08 +01:00
Tomas Kral
7dac1a33d2 Merge pull request #413 from procrypt/add_buildConfig_to_kompose_down
add BuildConfig support to kompose down
2017-02-15 11:15:07 +01:00
Tomas Kral
d20a42e447 Merge pull request #405 from procrypt/unit_tests
Unit tests for error out if controller object is specified with restart: on-failure
2017-02-14 15:36:31 +01:00
Tomas Kral
816b74811d Merge pull request #429 from surajssd/change_service_names
normalize docker-compose service that has name with underscore
2017-02-14 15:26:21 +01:00
Charlie Drage
15636ee599 Merge pull request #418 from kadel/pkgs-lazy-set
Update Makefile - lazy set for PKGS variable
2017-02-14 08:38:58 -05:00
Suraj Deshmukh
0bc24d5ca6 normalize docker-compose service that has name with underscore
kubernetes or openshift does not allow underscores in the object
names, while docker-compose does, in this commit the code has been
added to convert underscores to hypens.
2017-02-14 17:39:42 +05:30
Tomas Kral
ac074e2c36
Update Makefile - lazy set for PKGS variable
Using lazy set we can run targets that are not requring PKGS without
requiring glide.
Lazy set is expended when variable is used, not when declared.
2017-02-14 10:43:30 +01:00
Suraj Deshmukh
775f5012c9 removed unnecessary objects in compose.go
In compoese.go while iterating on the ServiceConfig objects first
it's keys were pulled and then data was pulled separately which
can be done in one step by iterating on the dictionary.
2017-02-14 08:30:38 +05:30
Charlie Drage
d444886e2f Update vendoring
Updates vendoring to include
1c4bd4542a
as well as general update to all other packages.
2017-02-13 09:59:13 -05:00
Abhishek
7a12a16dc7 Unit test for error out if controller object is specified with restart: on-failure 2017-02-13 12:41:16 +05:30
Charlie Drage
f918d51cc1 Merge pull request #423 from kadel/fix-version-gitcommit
fix passing gitcommit in version output
2017-02-11 18:41:27 -05:00
Tomas Kral
18955c63d4
fix passing gitcommit in version output 2017-02-11 17:05:08 +01:00
Tomas Kral
17126345ef Merge pull request #393 from cdrage/host-container-protocol-bug
Add support for host:port:port
2017-02-10 10:51:35 +01:00
Charlie Drage
438088f37d Add support for host:port:port
This adds support for supplying for example:
"127.0.0.1:80:80/tcp" to docker-compose.yaml and converting it to it's
corresponding Kubernetes / OpenShift hostIP.

This commit also refactors the loadPorts function of compose.go

Closes https://github.com/kubernetes-incubator/kompose/issues/335
2017-02-09 12:21:17 -05:00
Suraj Deshmukh
be042c7e1f Merge pull request #415 from cdrage/fix-spelling-error-down-openshift
Fix a small spelling error
2017-02-09 06:03:50 +01:00
Charlie Drage
01bf975185 Fix a small spelling error
s/service/Service/g
2017-02-08 08:55:43 -05:00
Abhishek
846812677d add buildConfig support to kompose down 2017-02-06 17:24:04 +05:30
Tomas Kral
ca45137cb0 Merge pull request #396 from cdrage/update-the-release-script
Update the release script
2017-02-05 13:57:35 +01:00