2 files changed, 40 insertions, 3 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index 7bef62355..e14276bdf 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	v1 "k8s.io/api/core/v1"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -938,3 +939,37 @@ func envSliceToMap(env []string) map[string]string {
 	}
 	return m
 }
+
+// GenerateKube generates kubernetes yaml based on a pod or container
+func GenerateKube(name string, service bool, r *libpod.Runtime) (*v1.Pod, *v1.Service, error) {
+	var (
+		pod          *libpod.Pod
+		podYAML      *v1.Pod
+		err          error
+		container    *libpod.Container
+		servicePorts []v1.ServicePort
+		serviceYAML  v1.Service
+	)
+	// Get the container in question
+	container, err = r.LookupContainer(name)
+	if err != nil {
+		pod, err = r.LookupPod(name)
+		if err != nil {
+			return nil, nil, err
+		}
+		podYAML, servicePorts, err = pod.GenerateForKube()
+	} else {
+		if len(container.Dependencies()) > 0 {
+			return nil, nil, errors.Wrapf(libpod.ErrNotImplemented, "containers with dependencies")
+		}
+		podYAML, err = container.GenerateForKube()
+	}
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if service {
+		serviceYAML = libpod.GenerateKubeServiceFromV1Pod(podYAML, servicePorts)
+	}
+	return podYAML, &serviceYAML, nil
+}
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go
index 9afbd68c8..2e1827561 100644
--- a/cmd/podman/shared/intermediate.go
+++ b/cmd/podman/shared/intermediate.go
@@ -360,7 +360,7 @@ func newCRStringArray(c *cliconfig.PodmanCommand, flag string) CRStringArray {
 }
 
 // NewIntermediateLayer creates a GenericCLIResults from a create or run cli-command
-func NewIntermediateLayer(c *cliconfig.PodmanCommand) GenericCLIResults {
+func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIResults {
 	m := make(map[string]GenericCLIResult)
 
 	m["add-host"] = newCRStringSlice(c, "add-host")
@@ -458,8 +458,10 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand) GenericCLIResults {
 	m["volumes-from"] = newCRStringSlice(c, "volumes-from")
 	m["workdir"] = newCRString(c, "workdir")
 	// global flag
-	m["trace"] = newCRBool(c, "trace")
-	m["syslog"] = newCRBool(c, "syslog")
+	if !remote {
+		m["trace"] = newCRBool(c, "trace")
+		m["syslog"] = newCRBool(c, "syslog")
+	}
 
 	return GenericCLIResults{m, c.InputArgs}
 }