From 83ffd328d9d6bf188c16d52ea73d76bcba937af2 Mon Sep 17 00:00:00 2001 From: Suraj Narwade Date: Mon, 4 Dec 2017 13:09:49 +0530 Subject: [PATCH] Fixed conversion matrix Updated conversion matrix as cpus under deploy.resources in docker compose v3 are supported now --- docs/conversion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conversion.md b/docs/conversion.md index ae45f68c..25a50fb6 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -33,7 +33,7 @@ __Glossary:__ | deploy: replicas | - | - | ✓ | Deployment.Spec.Replicas / DeploymentConfig.Spec.Replicas | | | deploy: placement | - | - | ✓ | Pod.Spec.NodeSelector | | | deploy: update_config | - | - | n | | | -| deploy: resources | - | - | ✓ | Containers.Resources.Limits.Memory | Support for memory but not CPU | +| deploy: resources | - | - | ✓ | Containers.Resources.Limits.Memory / Containers.Resources.Limits.CPU | Support for memory as well as cpu | | deploy: restart_policy | - | - | ✓ | Pod generation | This generated a Pod, see the [user guide on restart](http://kompose.io/user-guide/#restart) | | deploy: labels | - | - | n | | | | devices | x | x | x | | Not supported within Kubernetes, See issue https://github.com/kubernetes/kubernetes/issues/5607 |