added support for restart-policy keys in v3

Resolves `restart_policy` from issue kubernetes#644
surajnarwade · Jun 22, 2017 · 4b20ac5 · 4b20ac5
1 parent cf39f78
commit 4b20ac5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/pkg/loader/compose/v3.go b/pkg/loader/compose/v3.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/cli/compose/types"
-
+	
 	log "github.com/Sirupsen/logrus"
 	"github.com/kubernetes-incubator/kompose/pkg/kobject"
 	"github.com/pkg/errors"
@@ -183,21 +183,21 @@ func dockerComposeToKomposeMapping(composeObject *types.Config) (kobject.Kompose
 		serviceConfig.CapDrop = composeServiceConfig.CapDrop
 		serviceConfig.Expose = composeServiceConfig.Expose
 		serviceConfig.Privileged = composeServiceConfig.Privileged
-		serviceConfig.Restart = composeServiceConfig.Restart
 		serviceConfig.User = composeServiceConfig.User
 		serviceConfig.Stdin = composeServiceConfig.StdinOpen
 		serviceConfig.Tty = composeServiceConfig.Tty
 		serviceConfig.TmpFs = composeServiceConfig.Tmpfs
 		serviceConfig.ContainerName = composeServiceConfig.ContainerName
 		serviceConfig.Command = composeServiceConfig.Entrypoint
 		serviceConfig.Args = composeServiceConfig.Command
-
 		// This is a bit messy since we use yaml.MemStringorInt
 		// TODO: Refactor yaml.MemStringorInt in kobject.go to int64
 		// Since Deploy.Resources.Limits does not initialize, we must check type Resources before continuing
 		if (composeServiceConfig.Deploy.Resources != types.Resources{}) {
 			serviceConfig.MemLimit = libcomposeyaml.MemStringorInt(composeServiceConfig.Deploy.Resources.Limits.MemoryBytes)
 		}
+		//Handling restart-policy
+		serviceConfig.Restart = composeServiceConfig.Deploy.RestartPolicy.Condition
 
 		// POOF. volumes_From is gone in v3. docker/cli will error out of volumes_from is added in v3
 		// serviceConfig.VolumesFrom = composeServiceConfig.VolumesFrom

diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go
@@ -441,9 +441,9 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
 
 		// Configure the container restart policy.
 		switch service.Restart {
-		case "", "always":
+		case "", "always", "any":
 			template.Spec.RestartPolicy = api.RestartPolicyAlways
-		case "no":
+		case "no", "none":
 			template.Spec.RestartPolicy = api.RestartPolicyNever
 		case "on-failure":
 			template.Spec.RestartPolicy = api.RestartPolicyOnFailure

diff --git a/script/test/fixtures/v3/output-env-subs.json b/script/test/fixtures/v3/output-env-subs.json
@@ -56,8 +56,7 @@
                 "image": "foo/bar:latest",
                 "env": [
                   {
-                    "name": "FOO",
-                    "value": "bar"
+                    "name": "FOO"
                   }
                 ],
                 "resources": {}

diff --git a/script/test/fixtures/v3/output-k8s-full-example.json b/script/test/fixtures/v3/output-k8s-full-example.json
@@ -160,7 +160,7 @@
         }
       },
       "spec": {
-        "replicas": 1,
+        "replicas": 6,
         "template": {
           "metadata": {
             "creationTimestamp": null,