Skip to content
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

Update docs to reflect conversion changes #749

Merged
merged 1 commit into from
Aug 9, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/conversion.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ __N/A:__ Not applicable / no 1-1 conversion
| cgroup_parent | N/A | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/11986 |
| container_name | Y | Metadata.Name + Deployment.Spec.Containers.Name | |
| devices | N/A | | Not supported within Kubernetes, See issue https://github.com/kubernetes/kubernetes/issues/5607 |
| depends_on | N/A | | |
| depends_on | N/A | | No 1-1 mapping, Kubernetes uses a flat architecture |
| dns | N/A | | Not used within Kubernetes. Kubernetes uses a managed DNS server |
| dns_search | N/A | | See `dns` key |
| tmpfs | Y | Pod.Spec.Containers.Volumes.EmptyDir | Creates emptyDirvolume with medium set to Memory & mounts given directory inside container |
Expand Down Expand Up @@ -49,18 +49,18 @@ __N/A:__ Not applicable / no 1-1 conversion
| volumes | Y | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster |
| volume_driver | N/A | | Different plugins for different volumes, see: https://kubernetes.io/docs/concepts/storage/volumes/ |
| volumes_from | Y | PersistentVolumeClaim | Creates a PersistentVolumeClaim that is both shared by deployment and deployment config (OpenShift) |
| cpu_shares | N/A | | No direct mapping, use `resources` key within Docker Compose Version 3 `deploy` |
| cpu_quota | N/A | | No direct mapping, use `resources` key within Docker Compose Version 3 `deploy` |
| cpuset | N/A | | No direct mapping, use `resources` key within Docker Compose Version 3 `deploy` |
| mem_limit | Y | Containers.Resources.Limits.Memory | |
| memswap_limit | N/A | | Use mem_limit |
| cpu_shares | Y | | No direct mapping, use `resources` key within Docker Compose Version 3 `deploy` |
| cpu_quota | Y | | No direct mapping, use `resources` key within Docker Compose Version 3 `deploy` |
| cpuset | Y | | No direct mapping, use `resources` key within Docker Compose Version 3 `deploy` |
| mem_limit | Y | Containers.Resources.Limits.Memory | Maps, but recommended to use `resources` key within Version 3 `deploy` |
| memswap_limit | N/A | | Removed in V3+, use mem_limit |
| | | | |
| __Deploy__ | | | |
| mode | N | | |
| replicas | Y | Deployment.Spec.Replicas / DeploymentConfig.Spec.Replicas | |
| placement | N | | |
| update_config | N | | |
| resources | Y | Containers.Resources.Limits.Memory | Support for memory but not CPU |
| resources | Y | Containers.Resources.Limits / Containers.Resources.Requests | Supports memory/cpu limits as well as memory/cpu requests |
| restart_policy | Y | Pod generation | This generated a Pod, see the [user guide on restart](http://kompose.io/user-guide/#restart) |
| labels | N | | |
| | | | |
Expand Down