diff --git a/charts/library/Chart.yaml b/charts/library/Chart.yaml index b7bd966..b25a2f9 100644 --- a/charts/library/Chart.yaml +++ b/charts/library/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: library description: Buttahtoast Helm Library type: library -version: 3.0.0-rc.1 +version: 3.0.0-rc.3 appVersion: 0.1.0 home: https://github.com/buttahtoast/helm-charts/tree/master/charts/library icon: "https://avatars0.githubusercontent.com/u/67652090?s=400&u=874d1c989b0afc2789865be01051f0bbfc84ae32&v=4" diff --git a/charts/library/README.md b/charts/library/README.md index a4c7981..866755e 100644 --- a/charts/library/README.md +++ b/charts/library/README.md @@ -1,6 +1,6 @@ # Buttahtoast Library -![Version: 3.0.0-rc.1](https://img.shields.io/badge/Version-3.0.0--rc.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) +![Version: 3.0.0-rc.3](https://img.shields.io/badge/Version-3.0.0--rc.3-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) This is our take on a library Chart. It contains simple functions which are (will be) used across all of our charts. Feel free the add or improve the existing templates. This Chart is still under development/testing. Feel free to use it, if you find any issues with it, please create an issue/PR. We will try to get bugs fixed as soon as possible! diff --git a/charts/library/templates/utils/_dicts.tpl b/charts/library/templates/utils/_dicts.tpl index 73572f5..d3395d3 100644 --- a/charts/library/templates/utils/_dicts.tpl +++ b/charts/library/templates/utils/_dicts.tpl @@ -265,9 +265,11 @@ {{- if (kindIs "slice" $.data) -}} {{- $_ := set $ "data" (without $.data (include "lib.utils.dicts.merge.int.inject_key" $)) -}} {{- range $d := $.data -}} - {{- $mk := include "lib.utils.dicts.merge.int.merge_key" $d -}} - {{- if $mk -}} - {{- $_ := set $ "data" (without $.data $mk) -}} + {{- if (kindIs "string" $d) -}} + {{- $mk := include "lib.utils.dicts.merge.int.merge_key" $d -}} + {{- if $mk -}} + {{- $_ := set $ "data" (without $.data $mk) -}} + {{- end -}} {{- end -}} {{- end -}} {{- end -}}