diff --git a/charts/manifests/Chart.yaml b/charts/manifests/Chart.yaml index c8de88ee..88f4fe8f 100644 --- a/charts/manifests/Chart.yaml +++ b/charts/manifests/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: manifests description: "Bedag's Manifest chart. Library full of basic kubernetes manifests." type: library -version: 0.7.0 +version: 0.8.0 icon: "https://www.bedag.ch/wGlobal/wGlobal/layout/images/logo.svg" keywords: - Bedag @@ -22,4 +22,4 @@ annotations: artifacthub.io/prerelease: "false" artifacthub.io/license: Apache-2.0 artifacthub.io/changes: | - - "[Added]: Common Utils (Label Wrappers, Templates & Documentation)" + - "[Added]: Functionality for environment from source" diff --git a/charts/manifests/README.md b/charts/manifests/README.md index d9799266..8f9ab63e 100644 --- a/charts/manifests/README.md +++ b/charts/manifests/README.md @@ -1,6 +1,6 @@ # Manifests Library -![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) This library's purpose is to have more flexibility as chart author but at the same time have kubernetes manifests managed in a central library. This way you can avoid big surprises when Kubernetes has breaking changes in any of their APIs. Currently we support a base set of resources. Resources may be added as soon as we see or get a request that there's a need for it. This chart is still under development and testing, since it's rather complex. Feel free to use it. Our goal is to get it as reliable as possible. diff --git a/charts/manifests/templates/manifests/templates/_containerTpl.tpl b/charts/manifests/templates/manifests/templates/_containerTpl.tpl index 845bb933..74ff9e90 100644 --- a/charts/manifests/templates/manifests/templates/_containerTpl.tpl +++ b/charts/manifests/templates/manifests/templates/_containerTpl.tpl @@ -51,6 +51,9 @@ env: {{- include "lib.utils.extras.environment" $context | nindent 2 }} {{- include "lib.utils.strings.template" (dict "value" $filteredList "context" $context) | nindent 2 }} {{- end }} {{- end }} + {{- with $values.envFrom }} +envFrom: {{- include "lib.utils.strings.template" (dict "value" . "context" $context) | nindent 2 }} + {{- end }} {{- if $values.command }} command: {{- include "lib.utils.strings.template" (dict "value" $values.command "context" $context) | nindent 2 }} {{- end }} diff --git a/charts/manifests/templates/values/manifests/templates/_containerTpl.yaml b/charts/manifests/templates/values/manifests/templates/_containerTpl.yaml index 7cd5fe8d..dc3d748e 100644 --- a/charts/manifests/templates/values/manifests/templates/_containerTpl.yaml +++ b/charts/manifests/templates/values/manifests/templates/_containerTpl.yaml @@ -56,7 +56,14 @@ environment: {{ toYaml (default list $_.data.environment) | nindent 2 }} # valueFrom: # fieldRef: # fieldPath: spec.* - # + +## Environment from Source +# {{ $_.path }}envFrom -- Configure Environment from Source +envFrom: {{ toYaml (default list $_.data.envFrom) | nindent 2 }} + #- configMapRef: + #name: configmapname + #- secretRef: + #name: secretname ## Container Ports # {{ $_.path }}ports -- Configure Container Ports