From 0ec98a57a9ff982bb4336306d411de07b5dfca1c Mon Sep 17 00:00:00 2001 From: Paul Volavsek Date: Wed, 20 Oct 2021 13:50:14 +0200 Subject: [PATCH 1/3] add custom env vars --- bring-your-own-datacenter/Chart.yaml | 2 +- bring-your-own-datacenter/README.md | 4 +++- bring-your-own-datacenter/templates/manifests/byodc.yml | 3 +++ bring-your-own-datacenter/values.yaml | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bring-your-own-datacenter/Chart.yaml b/bring-your-own-datacenter/Chart.yaml index 31adb82..8e6598c 100644 --- 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 index 0e10758..f47d8b1 100644 --- 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 ``` + + + diff --git a/bring-your-own-datacenter/templates/manifests/byodc.yml b/bring-your-own-datacenter/templates/manifests/byodc.yml index 86f2f18..d40b106 100644 --- 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 index 79a11ec..2eba73e 100644 --- a/bring-your-own-datacenter/values.yaml +++ b/bring-your-own-datacenter/values.yaml @@ -13,6 +13,8 @@ byodc: ftp: null # configuration settings for the byodc config: + # an array of environment variables (see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#envvar-v1-core) added to the byodc deployment + env: null redis: # hostname of the redis instance (only change if using external redis instance) host: redis.{{ .Release.Namespace }} From e8d13b8d088cffdb35535c62dc8fbe5d08273eda Mon Sep 17 00:00:00 2001 From: Paul Volavsek Date: Wed, 20 Oct 2021 13:52:23 +0200 Subject: [PATCH 2/3] change position --- bring-your-own-datacenter/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bring-your-own-datacenter/values.yaml b/bring-your-own-datacenter/values.yaml index 2eba73e..9b6a924 100644 --- a/bring-your-own-datacenter/values.yaml +++ b/bring-your-own-datacenter/values.yaml @@ -13,8 +13,6 @@ byodc: ftp: null # configuration settings for the byodc config: - # an array of environment variables (see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#envvar-v1-core) added to the byodc deployment - env: null redis: # hostname of the redis instance (only change if using external redis instance) host: redis.{{ .Release.Namespace }} @@ -38,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 From 9e7efb5cdb2c19a94d80de50e98182b3665e9aff Mon Sep 17 00:00:00 2001 From: Paul Volavsek Date: Wed, 20 Oct 2021 14:11:54 +0200 Subject: [PATCH 3/3] add latest image --- azure-pipelines/Repo-CI.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines/Repo-CI.yaml b/azure-pipelines/Repo-CI.yaml index 47dbd4b..98850fe 100644 --- 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: