-
Notifications
You must be signed in to change notification settings - Fork 770
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
support for volumes_from docker-compose construct #190
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
script/test/fixtures/volume-mounts/volumes-from/docker-compose.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| version: "2" | ||
|
|
||
| services: | ||
| web: | ||
| image: centos/httpd | ||
| volumes: | ||
| - "./app:/src/app" | ||
| ports: | ||
| - "3030:3000" | ||
| command: nodemon -L app/bin/www | ||
|
|
||
| nginx: | ||
| restart: always | ||
| image: nginx | ||
| ports: | ||
| - "80:80" | ||
| volumes: | ||
| - /www/public | ||
| volumes_from: | ||
| - web |
216 changes: 216 additions & 0 deletions
216
script/test/fixtures/volume-mounts/volumes-from/output-k8s.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| { | ||
| "kind": "List", | ||
| "apiVersion": "v1", | ||
| "metadata": {}, | ||
| "items": [ | ||
| { | ||
| "kind": "Service", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "web", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "service": "web" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "ports": [ | ||
| { | ||
| "name": "3030", | ||
| "protocol": "TCP", | ||
| "port": 3030, | ||
| "targetPort": 3000 | ||
| } | ||
| ], | ||
| "selector": { | ||
| "service": "web" | ||
| } | ||
| }, | ||
| "status": { | ||
| "loadBalancer": {} | ||
| } | ||
| }, | ||
| { | ||
| "kind": "Service", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "nginx", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "service": "nginx" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "ports": [ | ||
| { | ||
| "name": "80", | ||
| "protocol": "TCP", | ||
| "port": 80, | ||
| "targetPort": 80 | ||
| } | ||
| ], | ||
| "selector": { | ||
| "service": "nginx" | ||
| } | ||
| }, | ||
| "status": { | ||
| "loadBalancer": {} | ||
| } | ||
| }, | ||
| { | ||
| "kind": "Deployment", | ||
| "apiVersion": "extensions/v1beta1", | ||
| "metadata": { | ||
| "name": "web", | ||
| "creationTimestamp": null | ||
| }, | ||
| "spec": { | ||
| "replicas": 1, | ||
| "template": { | ||
| "metadata": { | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "service": "web" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "volumes": [ | ||
| { | ||
| "name": "web-claim0", | ||
| "persistentVolumeClaim": { | ||
| "claimName": "web-claim0" | ||
| } | ||
| } | ||
| ], | ||
| "containers": [ | ||
| { | ||
| "name": "web", | ||
| "image": "centos/httpd", | ||
| "args": [ | ||
| "nodemon", | ||
| "-L", | ||
| "app/bin/www" | ||
| ], | ||
| "ports": [ | ||
| { | ||
| "containerPort": 3000, | ||
| "protocol": "TCP" | ||
| } | ||
| ], | ||
| "resources": {}, | ||
| "volumeMounts": [ | ||
| { | ||
| "name": "web-claim0", | ||
| "mountPath": "/src/app" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "restartPolicy": "Always" | ||
| } | ||
| }, | ||
| "strategy": {} | ||
| }, | ||
| "status": {} | ||
| }, | ||
| { | ||
| "kind": "PersistentVolumeClaim", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "web-claim0", | ||
| "creationTimestamp": null | ||
| }, | ||
| "spec": { | ||
| "accessModes": [ | ||
| "ReadWriteOnce" | ||
| ], | ||
| "resources": { | ||
| "requests": { | ||
| "storage": "100Mi" | ||
| } | ||
| } | ||
| }, | ||
| "status": {} | ||
| }, | ||
| { | ||
| "kind": "Deployment", | ||
| "apiVersion": "extensions/v1beta1", | ||
| "metadata": { | ||
| "name": "nginx", | ||
| "creationTimestamp": null | ||
| }, | ||
| "spec": { | ||
| "replicas": 1, | ||
| "template": { | ||
| "metadata": { | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "service": "nginx" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "volumes": [ | ||
| { | ||
| "name": "nginx-claim0", | ||
| "persistentVolumeClaim": { | ||
| "claimName": "nginx-claim0" | ||
| } | ||
| }, | ||
| { | ||
| "name": "web-claim0", | ||
| "persistentVolumeClaim": { | ||
| "claimName": "web-claim0" | ||
| } | ||
| } | ||
| ], | ||
| "containers": [ | ||
| { | ||
| "name": "nginx", | ||
| "image": "nginx", | ||
| "ports": [ | ||
| { | ||
| "containerPort": 80, | ||
| "protocol": "TCP" | ||
| } | ||
| ], | ||
| "resources": {}, | ||
| "volumeMounts": [ | ||
| { | ||
| "name": "nginx-claim0", | ||
| "mountPath": "/www/public" | ||
| }, | ||
| { | ||
| "name": "web-claim0", | ||
| "mountPath": "/src/app" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "restartPolicy": "Always" | ||
| } | ||
| }, | ||
| "strategy": {} | ||
| }, | ||
| "status": {} | ||
| }, | ||
| { | ||
| "kind": "PersistentVolumeClaim", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "nginx-claim0", | ||
| "creationTimestamp": null | ||
| }, | ||
| "spec": { | ||
| "accessModes": [ | ||
| "ReadWriteOnce" | ||
| ], | ||
| "resources": { | ||
| "requests": { | ||
| "storage": "100Mi" | ||
| } | ||
| } | ||
| }, | ||
| "status": {} | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should make it better by reducing copied block of code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would appreciate help on this part of code repetition! I also asked about it once on slack!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. Probably we can use a common function to return a api.PodTemplateSpec struct for all cases. Then you don't have to repeat the
for _, dependentSvc...loop. That's not much but yeah I mean somehow it looks better a little bit.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because all resources in 4 cases contains api.PodTemplateSpec in their structs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But here I am adding data to the existing
t.Spec.Template.Spec.Volumesandt.Spec.Template.Spec.Containers[0].VolumeMountsso returning common blank struct won't help IMO.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK so I will check it and probably make an enhanced PR later. Let's get it merged. Thanks @surajssd 👍