fix blank lines for namespace, add new flag --preserve-ns

Author: suvaanshkumar

cmd/helmify/flags.go

@@ -54,7 +54,7 @@ func (i *arrayFlags) Set(value string) error {
 func ReadFlags() config.Config {
 	files := arrayFlags{}
 	result := config.Config{}
-	var h, help, version, crd bool
+	var h, help, version, crd , preservens bool
 	flag.BoolVar(&h, "h", false, "Print help. Example: helmify -h")
 	flag.BoolVar(&help, "help", false, "Print help. Example: helmify -help")
 	flag.BoolVar(&version, "version", false, "Print helmify version. Example: helmify -version")
@@ -68,7 +68,7 @@ func ReadFlags() config.Config {
 	flag.BoolVar(&result.FilesRecursively, "r", false, "Scan dirs from -f option recursively")
 	flag.BoolVar(&result.OriginalName, "original-name", false, "Use the object's original name instead of adding the chart's release name as the common prefix.")
 	flag.Var(&files, "f", "File or directory containing k8s manifests")
-
+	flag.BoolVar(&preservens, "preserve-ns", false, "Use the object's original namespace instead of adding all the resources to a common namespace")
 	flag.Parse()
 	if h || help {
 		fmt.Print(helpText)
@@ -87,6 +87,9 @@ func ReadFlags() config.Config {
 	if crd {
 		result.Crd = crd
 	}
+	if preservens {
+		result.PreserveNs = true
+	}
 	result.Files = files
 	return result
 }

pkg/config/config.go

@@ -36,6 +36,8 @@ type Config struct {
 	FilesRecursively bool
 	// OriginalName retains Kubernetes resource's original name
 	OriginalName bool
+	// PreserveNs retains the namespaces on the Kubernetes manifests
+	PreserveNs bool
 }
 
 func (c *Config) Validate() error {

pkg/processor/meta.go

@@ -16,7 +16,7 @@ const metaTemplate = `apiVersion: %[1]s
 kind: %[2]s
 metadata:
   name: %[3]s
-  %[7]s  	
+%[7]s
   labels:
 %[5]s
   {{- include "%[4]s.labels" . | nindent 4 }}
@@ -82,8 +82,8 @@ func ProcessObjMeta(appMeta helmify.AppMetadata, obj *unstructured.Unstructured,
 		}
 	}
 
-	if obj.GetNamespace() != "" {
-		namespace, err = yamlformat.Marshal(map[string]interface{}{"namespace": obj.GetNamespace()}, 0)
+	if (obj.GetNamespace() != "") && (appMeta.Config().PreserveNs){
+		namespace, err = yamlformat.Marshal(map[string]interface{}{"namespace": obj.GetNamespace()}, 2)
 		if err != nil {
 			return "", err
 		}