support chart path in name

Author: arttor

README.md

@@ -45,7 +45,7 @@ Tested with operator-sdk version: "v1.8.0".
     ```makefile
     HELMIFY = $(shell pwd)/bin/helmify
     helmify:
-        $(call go-get-tool,$(HELMIFY),github.com/arttor/helmify/cmd/[email protected].0)
+        $(call go-get-tool,$(HELMIFY),github.com/arttor/helmify/cmd/[email protected].2)
     
     helm: manifests kustomize helmify
         $(KUSTOMIZE) build config/default | $(HELMIFY)
@@ -63,7 +63,7 @@ Unpack the helmify binary and add it to your PATH and you are good to go!
 Helmify takes a chart name for an argument.
 Usage:
 
-```helmify [flags] CHART_NAME```  -  `CHART_NAME` is optional. Default is 'chart'.
+```helmify [flags] CHART_NAME```  -  `CHART_NAME` is optional. Default is 'chart'. Can be a directory, e.g. 'deploy/charts/mychart'.
 
 | flag | description | sample |
 | --- | --- | --- |

cmd/helmify/flags.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/arttor/helmify/pkg/config"
 )
@@ -20,7 +21,7 @@ Example 3: 'awk 'FNR==1 && NR!=1  {print "---"}{print}' /my_directory/*.yaml | h
   - will create 'mychart' directory with Helm chart from all yaml files in my_directory directory.
 
 Usage:
-  helmify [flags] CHART_NAME  -  CHART_NAME is optional. Default is 'chart'.
+  helmify [flags] CHART_NAME  -  CHART_NAME is optional. Default is 'chart'. Can be a directory, e.g. 'deploy/charts/mychart'.
 
 Flags:
 `
@@ -44,6 +45,11 @@ func ReadFlags() config.Config {
 		printVersion()
 		os.Exit(0)
 	}
-	result.ChartName = flag.Arg(0)
+	name := flag.Arg(0)
+	if name != "" {
+		result.ChartName = filepath.Base(name)
+		result.ChartDir = filepath.Dir(name)
+	}
+
 	return result
 }

examples/app/templates/deployment.yaml

@@ -35,8 +35,8 @@ spec:
             secretKeyRef:
               key: VAR2
               name: {{ include "app.fullname" . }}-secret-vars
-        image: {{ .Values.image.app.repository }}:{{ .Values.image.app.tag | default .Chart.AppVersion
-          }}
+        image: {{ .Values.app.app.image.repository }}:{{ .Values.app.app.image.tag | default
+          .Chart.AppVersion }}
         livenessProbe:
           httpGet:
             path: /healthz
@@ -67,7 +67,7 @@ spec:
       - args:
         - --secure-listen-address=0.0.0.0:8443
         - --v=10
-        image: {{ .Values.image.proxySidecar.repository }}:{{ .Values.image.proxySidecar.tag
+        image: {{ .Values.app.proxySidecar.image.repository }}:{{ .Values.app.proxySidecar.image.tag
           | default .Chart.AppVersion }}
         name: proxy-sidecar
         ports:

examples/app/values.yaml

@@ -1,12 +1,19 @@
 app:
   app:
+    image:
+      repository: controller
+      tag: latest
     resources:
       limits:
         cpu: 100m
         memory: 30Mi
       requests:
         cpu: 100m
         memory: 20Mi
+  proxySidecar:
+    image:
+      repository: gcr.io/kubebuilder/kube-rbac-proxy
+      tag: v0.8.0
   replicas: 3
 appService:
   ports:
@@ -30,13 +37,6 @@ configProps:
   myProp1: "1"
   myProp2: val 1
   myProp3: "true"
-image:
-  app:
-    repository: controller
-    tag: latest
-  proxySidecar:
-    repository: gcr.io/kubebuilder/kube-rbac-proxy
-    tag: v0.8.0
 secretCa:
   caCrt: ""
 secretVars:

examples/operator/templates/deployment.yaml

@@ -30,7 +30,7 @@ spec:
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --v=10
-        image: {{ .Values.image.kubeRbacProxy.repository }}:{{ .Values.image.kubeRbacProxy.tag
+        image: {{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag
           | default .Chart.AppVersion }}
         name: kube-rbac-proxy
         ports:
@@ -49,8 +49,8 @@ spec:
             secretKeyRef:
               key: VAR1
               name: {{ include "operator.fullname" . }}-secret-vars
-        image: {{ .Values.image.manager.repository }}:{{ .Values.image.manager.tag | default
-          .Chart.AppVersion }}
+        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag
+          | default .Chart.AppVersion }}
         livenessProbe:
           httpGet:
             path: /healthz

examples/operator/templates/secret-ca.yaml

@@ -5,5 +5,5 @@ metadata:
   labels:
   {{- include "operator.labels" . | nindent 4 }}
 data:
-  ca.crt: '{{ required "secret secretCa.caCrt is required" .Values.secretCa.caCrt
-    | b64enc }}'
+  ca.crt: {{ required "secretCa.caCrt is required" .Values.secretCa.caCrt | b64enc
+    | quote }}

examples/operator/templates/secret-vars.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
   {{- include "operator.labels" . | nindent 4 }}
 data:
-  VAR1: '{{ required "secret secretVars.var1 is required" .Values.secretVars.var1
-    | b64enc }}'
-  VAR2: '{{ required "secret secretVars.var2 is required" .Values.secretVars.var2
-    | b64enc }}'
+  VAR1: {{ required "secretVars.var1 is required" .Values.secretVars.var1 | b64enc
+    | quote }}
+  VAR2: {{ required "secretVars.var2 is required" .Values.secretVars.var2 | b64enc
+    | quote }}

examples/operator/values.yaml

@@ -1,5 +1,12 @@
 controllerManager:
+  kubeRbacProxy:
+    image:
+      repository: gcr.io/kubebuilder/kube-rbac-proxy
+      tag: v0.8.0
   manager:
+    image:
+      repository: controller
+      tag: latest
     resources:
       limits:
         cpu: 100m
@@ -8,13 +15,6 @@ controllerManager:
         cpu: 100m
         memory: 20Mi
   replicas: 1
-image:
-  kubeRbacProxy:
-    repository: gcr.io/kubebuilder/kube-rbac-proxy
-    tag: v0.8.0
-  manager:
-    repository: controller
-    tag: latest
 managerConfig:
   controllerManagerConfigYaml:
     health:

pkg/app/app.go

@@ -2,12 +2,13 @@ package app
 
 import (
 	"context"
-	"github.com/arttor/helmify/pkg/processor"
 	"io"
 	"os"
 	"os/signal"
 	"syscall"
 
+	"github.com/arttor/helmify/pkg/processor"
+
 	"github.com/arttor/helmify/pkg/config"
 	"github.com/arttor/helmify/pkg/decoder"
 	"github.com/arttor/helmify/pkg/helm"

pkg/app/context.go

@@ -67,7 +67,7 @@ func (c *appContext) CreateHelm(stop <-chan struct{}) error {
 		default:
 		}
 	}
-	return c.output.Create(c.appMeta.ChartName(), templates)
+	return c.output.Create(c.config.ChartDir, c.config.ChartName, templates)
 }
 
 func (c *appContext) process(obj *unstructured.Unstructured) (helmify.Template, error) {