From 482c5520c9a4f7efadca02b090f70819af934808 Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Wed, 15 Mar 2017 09:28:58 -0400 Subject: [PATCH] Remove extend from unused keys, add to conversion doc This removes the "unsupported" extends from the list (since we actually support) as well as add a clarificiation on the conversion.md document. Closes https://github.com/kubernetes-incubator/kompose/issues/475 Closes https://github.com/kubernetes-incubator/kompose/issues/493 --- docs/conversion.md | 2 +- pkg/loader/compose/compose.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/conversion.md b/docs/conversion.md index 438db204..7eb8e552 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -18,7 +18,7 @@ This document outlines all the conversion details regarding `docker-compose.yaml | env_file | | N | | | | environment | | Y | [Pod.Spec.Container.Env](https://kubernetes.io/docs/api-reference/v1/definitions/#_v1_envvar) | | | expose | | Y | [Service.Spec.Ports](https://kubernetes.io/docs/api-reference/v1/definitions/#_v1_containerport) | | -| extends | v2 | N | | | +| extends | v2 | Y | | Extends by utilizing the same image supplied | | external_links | | N | | | | extra_hosts | | N | | | | group_add | | N | | | diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index a0fee828..f7ef4112 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -59,7 +59,6 @@ func checkUnsupportedKey(composeProject *project.Project) []string { "DNSSearch": false, "DomainName": false, "EnvFile": false, - "Extends": false, "ExternalLinks": false, "ExtraHosts": false, "Hostname": false,