Merge pull request #5 from buttahtoast/dev

Improved Chart Metadata

Author: oliverbaehler

charts/helmize/Chart.yaml

@@ -2,13 +2,14 @@ apiVersion: v2
 name: helmize
 description: Go Sprig based deployment engine deployed via Helm
 type: library
-version: "0.1.0-rc.2"
+version: "0.1.0-rc.3"
 appVersion: "0.1.0"
-home: https://buttahtoast.github.io/helmize/
-icon: https://raw.githubusercontent.com/buttahtoast/helmize/main/icon.jpg
+home: https://helmize.dev
+icon: https://raw.githubusercontent.com/buttahtoast/helmize/main/icons/icon-transparent.png
 dependencies:
   - name: library
-    version: "2.2.2"
+    version: "2.2.3"
+    #repository: "file://../../../helm-charts-1/charts/library"
     repository: https://buttahtoast.github.io/helm-charts/ 
 keywords:
   - library

charts/helmize/templates/dropins/_defaults.tpl renamed to charts/helmize/bin/dropins/_defaults.tpl

@@ -4,21 +4,13 @@
   
 */}}
 {{- define "inventory.config.types.config" -}}
-{{- include "inventory.dropins.defaults.tpls_dir" $ }}:
-  types: [ "string" ]
 {{ include "inventory.conditions.defaults.inv_dir" $ }}:
   types: [ "string" ]
-{{ include "inventory.dropins.defaults.dropins" $ }}:
-  types: [ "slice" ]
 {{ include "inventory.conditions.defaults.conditions" $ }}:
   types: [ "slice" ]
 {{ include "inventory.entrypoint.defaults.force" $ }}:
   types: [ "bool", "int" ]
   default: false
-{{ include "inventory.render.defaults.file.merge_strategy" $ }}:
-  types: [ "string" ]
-  default: "path"
-  values: [ "file", "path" ]
 {{ include "inventory.render.defaults.file.excludes" $ }}:
   types: [ "string", "slice" ]
 {{ include "inventory.render.defaults.file.extensions" $ }}:
@@ -30,4 +22,5 @@
 {{ include "inventory.postrenders.defaults.cfg.post_renderers" $ }}:
   types: [ "slice" ]
   default: [ "{{ include "inventory.postrenders.defaults.cfg.post_renderers.inject_key" $ }}" ]
+{{ include "inventory.render.types.file_configuration" $ }}
 {{- end -}}

charts/helmize/templates/dropins/_types.tpl renamed to charts/helmize/bin/dropins/_types.tpl

@@ -8,8 +8,6 @@
 {{- define "inventory.entrypoint.func.deploy" -}}
   {{/* Summary */}}
   {{- $summary := (fromYaml (include "lib.utils.dicts.lookup" (dict "data" $.Values "path" (include "inventory.entrypoint.defaults.summary_value" $)))).res -}}
-t: {{- toYaml $summary | nindent 2 -}}  
-  
   {{- if $summary -}}
     {{- include "inventory.entrypoint.func.summary" $ -}}
   {{- else -}}

charts/helmize/templates/dropins/func/_get.tpl renamed to charts/helmize/bin/dropins/func/_get.tpl

@@ -82,3 +82,22 @@ no_match
 multiple_filename_id
 {{- end -}}
 
+
+{{- define "inventory.render.defaults.file_cfg.expand" -}}
+expand
+{{- end -}}
+
+
+{{- define "inventory.render.defaults.file_cfg.subpath" -}}
+subpath
+{{- end -}}
+
+
+{{/* Pattern (File Configuration Type, Local) <Template> 
+
+   IDs are used as Patterns to match against other ids. If Enabled the file won't be added if nothing matches.
+
+*/}}
+{{- define "inventory.render.defaults.file_cfg.pattern" -}}
+pattern
+{{- end -}}

charts/helmize/templates/dropins/func/_resolve.tpl renamed to charts/helmize/bin/dropins/func/_resolve.tpl

@@ -15,4 +15,13 @@
 {{ include "inventory.render.defaults.file_cfg.multi_filename" $ }}:
   types: [ "bool" ]
   default: false
+{{ include "inventory.render.defaults.file_cfg.subpath" $ }}:
+  types: [ "bool" ]
+  default: true
+{{ include "inventory.render.defaults.file_cfg.expand" $ }}:
+  types: [ "bool" ]
+  default: false
+{{ include "inventory.render.defaults.file_cfg.pattern" $ }}:
+  types: [ "bool" ]
+  default: false
 {{- end -}}

charts/helmize/templates/config/_types.tpl

@@ -17,4 +17,5 @@
   {{- else -}}
     {{- include "lib.utils.errors.fail" (printf "Render Returned invalid YAML:\n%s" (toYaml $render_raw | nindent 2)) -}}
   {{- end -}}
-{{- end -}}
+{{- end -}}
+