added support for multiple-compose files #312

procrypt · 2016-11-25T08:10:16Z

$ kompose -f docker-compose.yml,docker-guestbook.yml convert
INFO[0000] file "redis-master-service.json" created     
INFO[0000] file "redis-slave-service.json" created      
INFO[0000] file "redis-service.json" created            
INFO[0000] file "web-service.json" created              
INFO[0000] file "frontend-service.json" created         
INFO[0000] file "redis-master-deployment.json" created  
INFO[0000] file "redis-slave-deployment.json" created   
INFO[0000] file "redis-deployment.json" created         
INFO[0000] file "web-deployment.json" created           
INFO[0000] file "frontend-deployment.json" created

cc @kadel @surajssd

kadel · 2016-11-25T08:58:16Z

I'm not sure if comma separated list is right here :-(
With docker-compose it looks like this - docker-compose -f docker-compose.yml -f docker-guestbook.yml up
I think that we should do it in the same way as docker-compose does it.

@cdrage how would this work with #304 ?
Comma separated or multiple -f arguments?

cdrage · 2016-11-25T16:01:18Z

@kadel would be easy to implement via #304 once it's merged. But yes, multiple -f arguments would work with it.

kadel · 2016-11-28T14:28:53Z

Lets wait for #304. Thank we can revisit this.

coveralls · 2016-12-28T04:49:00Z

Coverage increased (+0.03%) to 45.768% when pulling 68a3361 on procrypt:multiple_files into 0370d66 on kubernetes-incubator:master.

surajssd · 2016-12-28T07:44:28Z

@procrypt unit tests, docs needed as well!

Also I thought we are trying to implement this the docker-compose cli way which is

docker-compose -f foo.yml -f bar.yml up

in our case

kompose -f foo.yml -f bar.yml up

as opposed to

kompose -f foo.yml,bar.yml up

surajssd · 2016-12-28T07:45:34Z

script/test/cmd/tests.sh

@@ -103,6 +103,7 @@ convert::expect_success "kompose --bundle $KOMPOSE_ROOT/script/test/fixtures/bun
 convert::expect_success_and_warning "kompose --bundle $KOMPOSE_ROOT/script/test/fixtures/bundles/dsb/docker-voting-bundle.dsb convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/bundles/dsb/output-k8s.json" "Service cannot be created because of missing port."

 ######
+<<<<<<< 73418310ac1e607b41d0af2588ed7a808a3c85fa


remove this line.

I pushed this by mistake.

surajssd · 2016-12-28T07:46:18Z

script/test/fixtures/multiple-compose-files/docker-compose.yml

+redis:
+  image: redis:3.0
+  ports:
+    - "6379"


a real world example where things get over-written will make more sense as opposed to mixing two apps.

things as in same parameters like env vars from 1st docker-compose file get over-written in second!

coveralls · 2016-12-30T08:18:00Z

Coverage increased (+1.8%) to 48.38% when pulling 1ff9136 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2016-12-30T08:20:41Z

Coverage increased (+1.8%) to 48.38% when pulling 1ff9136 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

procrypt · 2016-12-30T08:27:26Z

@surajssd @containscafeine I have updated the PR. Please review

$ kompose -f docker-compose.yml -f docker-guestbook.yml convert 
INFO[0000] file "frontend-service.json" created         
INFO[0000] file "mlbparks-service.json" created         
INFO[0000] file "mongodb-service.json" created          
INFO[0000] file "redis-master-service.json" created     
INFO[0000] file "redis-slave-service.json" created      
INFO[0000] file "frontend-deployment.json" created      
INFO[0000] file "mlbparks-deployment.json" created      
INFO[0000] file "mongodb-deployment.json" created       
INFO[0000] file "mongodb-claim0-persistentvolumeclaim.json" created 
INFO[0000] file "redis-master-deployment.json" created  
INFO[0000] file "redis-slave-deployment.json" created

$ kompose -f docker-compose.yml -f docker-guestbook.yml convert 
INFO[0000] file "mlbparks-service.json" created         
INFO[0000] file "frontend-service.json" created         
INFO[0000] file "mongodb-service.json" created          
INFO[0000] file "redis-master-service.json" created     
INFO[0000] file "redis-slave-service.json" created      
INFO[0000] file "frontend-deployment.json" created      
INFO[0000] file "mlbparks-deployment.json" created      
INFO[0000] file "mongodb-deployment.json" created       
INFO[0000] file "mongodb-claim0-persistentvolumeclaim.json" created 
INFO[0000] file "redis-master-deployment.json" created  
INFO[0000] file "redis-slave-deployment.json" created

The test are failing for this particular feature because the artifacts created are not in any particular order. When we run the kompose convert command sometimes mlbparks-service.json will be crated first and sometimes frontend-service.jsonand this makes it difficult to match the output in the tests for this feature. We need to think of a different testing strategy to test this rather than matching the output.

coveralls · 2016-12-30T08:39:32Z

Coverage increased (+1.8%) to 48.38% when pulling f91837e on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

surajssd · 2017-01-02T10:07:25Z

@procrypt even if the order is upside down, it should not cause any problems, because that is what happens for other conversion also, the order may not be same and still jq does the matching.

procrypt · 2017-01-02T10:10:17Z

@surajssd Thanks for the explanation, I'll recheck my work on the tests.

coveralls · 2017-01-03T04:43:00Z

Coverage increased (+1.8%) to 48.38% when pulling 04a2811 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T04:56:04Z

Coverage increased (+1.8%) to 48.38% when pulling 8e7bb17 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T04:58:49Z

Coverage increased (+1.8%) to 48.38% when pulling 8e7bb17 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T05:29:48Z

Coverage increased (+1.8%) to 48.38% when pulling 07fbe01 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T05:43:46Z

Coverage increased (+0.03%) to 46.617% when pulling 8ea7c97 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T05:47:17Z

Coverage increased (+0.03%) to 46.617% when pulling 8ea7c97 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

surajssd · 2017-01-03T05:55:10Z

@procrypt one last bit, add info about this awesome fetaure to docs! Rest LGTM

coveralls · 2017-01-03T06:19:59Z

Coverage increased (+0.03%) to 46.617% when pulling e8af6f1 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T09:59:01Z

Coverage increased (+0.03%) to 46.617% when pulling de2b448 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

coveralls · 2017-01-03T11:57:03Z

Coverage increased (+0.03%) to 46.617% when pulling a5a3805 on procrypt:multiple_files into 9c3fdaa on kubernetes-incubator:master.

surajssd · 2017-01-03T12:16:37Z

@procrypt thanks for awesome work, code + tests + docs 👍 🎉

procrypt · 2017-01-03T12:35:49Z

@surajssd Thank you all your help 😄

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 25, 2016

procrypt force-pushed the multiple_files branch from 75b46ae to 8df76b4 Compare November 25, 2016 08:21

sebgoa added this to the v0.3 release milestone Nov 28, 2016

procrypt force-pushed the multiple_files branch from 8df76b4 to 68a3361 Compare December 28, 2016 04:41

surajssd reviewed Dec 28, 2016

View reviewed changes

procrypt force-pushed the multiple_files branch 2 times, most recently from 1d3b7d4 to 1ff9136 Compare December 30, 2016 08:13

procrypt force-pushed the multiple_files branch from 1ff9136 to f91837e Compare December 30, 2016 08:31

procrypt force-pushed the multiple_files branch 2 times, most recently from f097abe to 8e7bb17 Compare January 3, 2017 04:50

procrypt force-pushed the multiple_files branch from 8e7bb17 to 07fbe01 Compare January 3, 2017 05:22

procrypt force-pushed the multiple_files branch 2 times, most recently from 49efcdd to 8ea7c97 Compare January 3, 2017 05:39

procrypt force-pushed the multiple_files branch from 8ea7c97 to e8af6f1 Compare January 3, 2017 06:12

procrypt force-pushed the multiple_files branch from e8af6f1 to de2b448 Compare January 3, 2017 09:50

added support for multiple-compose files

a5a3805

procrypt force-pushed the multiple_files branch from de2b448 to a5a3805 Compare January 3, 2017 11:49

surajssd approved these changes Jan 3, 2017

View reviewed changes

surajssd merged commit b059c44 into kubernetes:master Jan 3, 2017

nathan-K- mentioned this pull request Mar 26, 2018

Merge multiple docker-compose files #968

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added support for multiple-compose files #312

added support for multiple-compose files #312

procrypt commented Nov 25, 2016 •

edited

Loading

kadel commented Nov 25, 2016

cdrage commented Nov 25, 2016

kadel commented Nov 28, 2016

coveralls commented Dec 28, 2016

surajssd commented Dec 28, 2016 •

edited

Loading

surajssd Dec 28, 2016

procrypt Dec 29, 2016

surajssd Dec 28, 2016

surajssd Dec 28, 2016

coveralls commented Dec 30, 2016

coveralls commented Dec 30, 2016

procrypt commented Dec 30, 2016

coveralls commented Dec 30, 2016

surajssd commented Jan 2, 2017

procrypt commented Jan 2, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

surajssd commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

surajssd commented Jan 3, 2017

procrypt commented Jan 3, 2017

added support for multiple-compose files #312

added support for multiple-compose files #312

Conversation

procrypt commented Nov 25, 2016 • edited Loading

kadel commented Nov 25, 2016

cdrage commented Nov 25, 2016

kadel commented Nov 28, 2016

coveralls commented Dec 28, 2016

surajssd commented Dec 28, 2016 • edited Loading

surajssd Dec 28, 2016

Choose a reason for hiding this comment

procrypt Dec 29, 2016

Choose a reason for hiding this comment

surajssd Dec 28, 2016

Choose a reason for hiding this comment

surajssd Dec 28, 2016

Choose a reason for hiding this comment

coveralls commented Dec 30, 2016

coveralls commented Dec 30, 2016

procrypt commented Dec 30, 2016

coveralls commented Dec 30, 2016

surajssd commented Jan 2, 2017

procrypt commented Jan 2, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

surajssd commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

coveralls commented Jan 3, 2017

surajssd commented Jan 3, 2017

procrypt commented Jan 3, 2017

procrypt commented Nov 25, 2016 •

edited

Loading

surajssd commented Dec 28, 2016 •

edited

Loading