4 Commits

Author	SHA1	Message	Date
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	bc28ffc675	Upgrade deployment/daemonset to apps/v1 (#1207)	2019-12-26 16:36:11 +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