From 62c34a2208a1da7acac3cc61cdba12f57afaed12 Mon Sep 17 00:00:00 2001 From: Tuna Date: Sat, 5 Nov 2016 21:57:33 +0100 Subject: [PATCH] correct display when using --emptyvols --- pkg/transformer/kubernetes/kubernetes.go | 14 ++++++++++++-- pkg/transformer/openshift/openshift.go | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 71bc29d7..df99c3f9 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -378,7 +378,11 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con //Convert komposeObject objects := k.Transform(komposeObject, opt) - fmt.Println("We are going to create Kubernetes Deployments, Services and PersistentVolumeClaims for your Dockerized application. \n" + + pvcStr := " " + if !opt.EmptyVols { + pvcStr = " and PersistentVolumeClaims " + } + fmt.Println("We are going to create Kubernetes Deployments, Services" +pvcStr+ "for your Dockerized application. \n" + "If you need different kind of resources, use the 'kompose convert' and 'kubectl create -f' commands instead. \n") factory := cmdutil.NewFactory(nil) @@ -414,7 +418,13 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name) } } - fmt.Println("\nYour application has been deployed to Kubernetes. You can run 'kubectl get deployment,svc,pods,pvc' for details.") + + if !opt.EmptyVols { + pvcStr = ",pvc" + } else { + pvcStr = "" + } + fmt.Println("\nYour application has been deployed to Kubernetes. You can run 'kubectl get deployment,svc,pods" +pvcStr+ "' for details.") return nil } diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 20f18d63..1319a063 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -174,8 +174,11 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) error { //Convert komposeObject objects := o.Transform(komposeObject, opt) - - fmt.Println("We are going to create OpenShift DeploymentConfigs, Services and PersistentVolumeClaims for your Dockerized application. \n" + + pvcStr := " " + if !opt.EmptyVols { + pvcStr = " and PersistentVolumeClaims " + } + fmt.Println("We are going to create OpenShift DeploymentConfigs, Services" +pvcStr+ "for your Dockerized application. \n" + "If you need different kind of resources, use the 'kompose convert' and 'oc create -f' commands instead. \n") // initialize OpenShift Client @@ -229,7 +232,13 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name) } } - fmt.Println("\nYour application has been deployed to OpenShift. You can run 'oc get dc,svc,is,pvc' for details.") + + if !opt.EmptyVols { + pvcStr = ",pvc" + } else { + pvcStr = "" + } + fmt.Println("\nYour application has been deployed to OpenShift. You can run 'oc get dc,svc,is" +pvcStr+ "' for details.") return nil }