Commit Graph

9 Commits

Author SHA1 Message Date
Hang Yan
05e9bf4fc8
Support config short syntax and fix old bugs (#1230) 2020-01-05 10:19:22 +08:00
Hang Yan
1089a26844
Support port expose (#1227) 2020-01-04 14:15:10 +08:00
Chander G
5732a555cb Concat and merge service fields when merging compose files (#1186) (#1226)
according to docker compose specs, certain fields are merged and
certain others are concatented
2020-01-03 23:17:29 +08:00
Hang Yan
bc32e29ee4
Fix configmap name case error (#1215) 2019-12-27 22:39:45 +08:00
Hang Yan
d2d0d61cf2
Merge will include deploy resources (#1214) 2019-12-27 13:51:11 +08:00
Hang Yan
bc28ffc675
Upgrade deployment/daemonset to apps/v1 (#1207) 2019-12-26 16:36:11 +08:00
Chander G
5857252c3d Merge top level non-service keys (#1187)
* merge top level non-service keys

docker-compose default behaviour is to merge these top level keys such
as `networks`
2019-11-28 14:18:49 +08:00
Alan Justino da Silva
30655b4dd6 Copy the service labels also to Deployment Pod spec annotations (#1166)
* Copy the service labels also to Deployment Pod spec annotations

This allows kube2iam to work

* Remove test file forgotten from version 1.0.0

* Update test fixtures to have Deployment.spec.t.m.annotations

* Fix name conversion "test_server" -> "test-server"

It looks unrelated to my changes, but still changing.

* Fixing some more output fixtures
2019-09-02 10:06:28 +08:00
xianlubird
04e9ee9949 Fix missing attribute when convert with multiple docker-compose files
Signed-off-by: xianlubird <xianlubird@gmail.com>
2018-05-03 11:51:55 +08:00