From 73a9f7935d04d4a0234c216653b413d74ac51b1d Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Tue, 8 Aug 2017 10:14:08 -0400 Subject: [PATCH] Update docs to reflect conversion changes Updates the doc due to the recent changes to deploy keys as well as other mappings. --- docs/conversion.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/conversion.md b/docs/conversion.md index 07479149..1531456c 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -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 | @@ -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 | | | | | | | |