Merge pull request #4 from fiskaltrust/user/pvo/46671-env-vars

User/pvo/46671 env vars
fiskaltrust · Oct 20, 2021 · b007fea · b007fea
2 parents ab39e66 + 9e7efb5
commit b007fea
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/azure-pipelines/Repo-CI.yaml b/azure-pipelines/Repo-CI.yaml
@@ -2,6 +2,9 @@ resources:
   repositories:
     - repository: self
 
+pool:
+  vmImage: ubuntu-latest
+
 pr:
   branches:
     include:

diff --git a/bring-your-own-datacenter/Chart.yaml b/bring-your-own-datacenter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: bring-your-own-datacenter
 type: application
-version: 1.3.23
+version: 1.3.24
 keywords:
   - fiskaltrust
   - byodc

diff --git a/bring-your-own-datacenter/README.md b/bring-your-own-datacenter/README.md
@@ -5,7 +5,6 @@
 * Kubernetes cluster > v1.16
 * helm > v3.0
 
-
 ## Installation
 
 ### Create Namespace
@@ -55,3 +54,6 @@ Leave out `-f config.yaml` to install it with default values.
 helm uninstall bring-your-own-datacenter --namespace bring-your-own-datacenter
 kubectl delete namespace bring-your-own-datacenter
 ```
+
+
+<!-- helm dependency update -->
diff --git a/bring-your-own-datacenter/templates/manifests/byodc.yml b/bring-your-own-datacenter/templates/manifests/byodc.yml
@@ -52,6 +52,9 @@ spec:
             - name: {{ $key | upper }}_PROXY
               value: {{ $value | quote }}
               {{- end }}{{ end }}{{ end }}
+              {{- with .Values.byodc.config.env }}{{ range $value := . }}{{if $value }}
+            - {{ toYaml $value | nindent 14 | trim -}}
+              {{- end }}{{ end }}{{ end }}
           livenessProbe:
             httpGet:
               path: /health/live

diff --git a/bring-your-own-datacenter/values.yaml b/bring-your-own-datacenter/values.yaml
@@ -36,6 +36,8 @@ byodc:
     timeout:
       all: 900_000
       connect: 15_000
+    # array of environment variables (see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#envvar-v1-core) for the byodc deployment
+    env: null
 
 redis:
   # enable redis