From 9ce3f0cf157b1294185a7ee21acf67b4eadf8422 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 25 Oct 2016 23:38:11 -0400 Subject: [PATCH] cli: add --emptyvols option --- cli/app/app.go | 1 + cli/command/command.go | 8 ++++++++ pkg/kobject/kobject.go | 1 + pkg/transformer/kubernetes/kubernetes.go | 4 +++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cli/app/app.go b/cli/app/app.go index bb2052d1..6717d383 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -139,6 +139,7 @@ func Convert(c *cli.Context) { CreateDS: c.BoolT("daemonset"), CreateRC: c.BoolT("replicationcontroller"), CreateDeploymentConfig: c.BoolT("deploymentconfig"), + EmptyVols: c.BoolT("emptyvols"), } validateFlags(c, &opt) diff --git a/cli/command/command.go b/cli/command/command.go index 19ad595a..9e104ee2 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -88,6 +88,10 @@ func ConvertKubernetesCommand() cli.Command { Name: "chart,c", Usage: "Create a Helm chart for converted objects", }, + cli.BoolFlag{ + Name: "emptyvols", + Usage: "Use Empty Volumes. Don't generate PVCs", + }, cli.BoolFlag{ Name: "deployment,d", Usage: "Generate a Kubernetes deployment object (default on)", @@ -119,6 +123,10 @@ func ConvertOpenShiftCommand() cli.Command { Name: "deploymentconfig,dc", Usage: "Generate a OpenShift DeploymentConfig object", }, + cli.BoolFlag{ + Name: "emptyvols", + Usage: "Use Empty Volumes. Don't generate PVCs", + }, }, } command.Flags = append(command.Flags, commonConvertFlags()...) diff --git a/pkg/kobject/kobject.go b/pkg/kobject/kobject.go index fea19dc8..66885c9e 100644 --- a/pkg/kobject/kobject.go +++ b/pkg/kobject/kobject.go @@ -113,6 +113,7 @@ type ConvertOptions struct { CreateDeploymentConfig bool CreateChart bool GenerateYaml bool + EmptyVols bool Replicas int InputFile string OutFile string diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 7f3bd814..e3544cea 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -223,7 +223,9 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) ( volumes := []api.Volume{} var PVCs []*api.PersistentVolumeClaim - useEmptyVolumes := true + // Set a var based on if the user wants to use emtpy volumes + // as opposed to persistent volumes and volume claims + useEmptyVolumes := k.Opt.EmptyVols var count int for _, volume := range service.Volumes {