From 9a6c1d99b3048604643e8a5f0c9d36ca0a935a17 Mon Sep 17 00:00:00 2001 From: Suraj Narwade Date: Tue, 28 Mar 2017 15:21:02 +0530 Subject: [PATCH] Added warning after PVC creation Partially resolve #376 and #345 Added warning, such that PV should be created before PVC or if dynamic provision is there, no need to create PV. --- pkg/transformer/kubernetes/kubernetes.go | 7 +++++-- pkg/transformer/openshift/openshift.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index d8072cf3..16e83950 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -61,6 +61,9 @@ type Kubernetes struct { // used when undeploying resources from kubernetes const TIMEOUT = 300 +//default size of Persistent Volume Claim +const PVCRequestSize = "100Mi" + // list of all unsupported keys for this transformer // Keys are names of variables in kobject struct. // this is map to make searching for keys easier @@ -242,7 +245,7 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por // CreatePVC initializes PersistentVolumeClaim func (k *Kubernetes) CreatePVC(name string, mode string) (*api.PersistentVolumeClaim, error) { - size, err := resource.ParseQuantity("100Mi") + size, err := resource.ParseQuantity(PVCRequestSize) if err != nil { return nil, errors.Wrap(err, "resource.ParseQuantity failed, Error parsing size") } @@ -671,7 +674,7 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con if err != nil { return err } - log.Infof("Successfully created PersistentVolumeClaim: %s", t.Name) + log.Infof("Successfully created PersistentVolumeClaim: %s of size %s. If your cluster has dynamic storage provisioning, you don't have to do anything. Otherwise you have to create PersistentVolume to make PVC work", t.Name, PVCRequestSize) case *extensions.Ingress: _, err := client.Ingress(namespace).Create(t) if err != nil { diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 0523f518..90a590e4 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -496,7 +496,7 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv if err != nil { return err } - log.Infof("Successfully created PersistentVolumeClaim: %s", t.Name) + log.Infof("Successfully created PersistentVolumeClaim: %s of size %s. If your cluster has dynamic storage provisioning, you don't have to do anything. Otherwise you have to create PersistentVolume to make PVC work", t.Name, kubernetes.PVCRequestSize) case *routeapi.Route: _, err := oclient.Routes(namespace).Create(t) if err != nil {