From 2e6dff088cbb101507da413090c37e484b26d5af Mon Sep 17 00:00:00 2001
From: Mathieu GRZYBEK <mathieu.grzybek@s3ns.io>
Date: Thu, 19 Jan 2023 14:49:34 +0100
Subject: [PATCH] Use trustedProxies values as arrays

---
 tinkerbell/boots/templates/deployment.yaml | 2 +-
 tinkerbell/boots/values.yaml               | 2 +-
 tinkerbell/hegel/templates/deployment.yaml | 2 +-
 tinkerbell/hegel/values.yaml               | 2 +-
 tinkerbell/stack/README.md                 | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tinkerbell/boots/templates/deployment.yaml b/tinkerbell/boots/templates/deployment.yaml
index 07ba8e2f..8b046de2 100644
--- a/tinkerbell/boots/templates/deployment.yaml
+++ b/tinkerbell/boots/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
           {{- end }}
           env:
             - name: TRUSTED_PROXIES
-              value: {{ required "missing trustedProxies" .Values.trustedProxies | quote }}
+              value: {{ join "," .Values.trustedProxies }}
             {{- range $i, $env := .Values.env }}
             - name: {{ $env.name | quote }}
               value: {{ $env.value | quote }}
diff --git a/tinkerbell/boots/values.yaml b/tinkerbell/boots/values.yaml
index 14d43d45..c774d0f5 100644
--- a/tinkerbell/boots/values.yaml
+++ b/tinkerbell/boots/values.yaml
@@ -17,7 +17,7 @@ roleBindingName: boots-rolebinding
 deployment:
   strategy:
     type: Recreate
-trustedProxies: ""
+trustedProxies: []
 ports:
 - name: boots-dhcp
   port: 67
diff --git a/tinkerbell/hegel/templates/deployment.yaml b/tinkerbell/hegel/templates/deployment.yaml
index 81432b63..eb69e4e6 100644
--- a/tinkerbell/hegel/templates/deployment.yaml
+++ b/tinkerbell/hegel/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
           {{- end }}
           env:
             - name: HEGEL_TRUSTED_PROXIES
-              value: {{ required "missing trustedProxies" .Values.trustedProxies | quote }}
+              value: {{ join "," .Values.trustedProxies }}
             {{- range $i, $env := .Values.env }}
             - name: {{ $env.name | quote }}
               value: {{ $env.value | quote }}
diff --git a/tinkerbell/hegel/values.yaml b/tinkerbell/hegel/values.yaml
index ae6d2b60..1af08fa5 100644
--- a/tinkerbell/hegel/values.yaml
+++ b/tinkerbell/hegel/values.yaml
@@ -1,5 +1,5 @@
 deploy: true
-trustedProxies: ""
+trustedProxies: []
 name: hegel
 image: quay.io/tinkerbell/hegel:v0.10.1
 imagePullPolicy: IfNotPresent
diff --git a/tinkerbell/stack/README.md b/tinkerbell/stack/README.md
index d56750e3..579aad5b 100644
--- a/tinkerbell/stack/README.md
+++ b/tinkerbell/stack/README.md
@@ -7,7 +7,7 @@ This chart installs the full Tinkerbell stack.
 ```bash
 helm dependency build stack/
 trusted_proxies=$(kubectl get nodes -o jsonpath='{.items[*].spec.podCIDR}' | tr ' ' ',')
-helm install stack-release stack/ --create-namespace --namespace tink-system --wait --set "boots.trustedProxies=${trusted_proxies}" --set "hegel.trustedProxies=${trusted_proxies}"
+helm install stack-release stack/ --create-namespace --namespace tink-system --wait --set "boots.trustedProxies={${trusted_proxies}}" --set "hegel.trustedProxies={${trusted_proxies}}"
 ```
 
 ## Introduction
@@ -51,7 +51,7 @@ Now, deploy the chart.
 ```bash
 helm dependency build stack/
 trusted_proxies=$(kubectl get nodes -o jsonpath='{.items[*].spec.podCIDR}' | tr ' ' ',')
-helm install stack-release stack/ --create-namespace --namespace tink-system --wait --set "boots.trustedProxies=${trusted_proxies}" --set "hegel.trustedProxies=${trusted_proxies}"
+helm install stack-release stack/ --create-namespace --namespace tink-system --wait --set "boots.trustedProxies={${trusted_proxies}}" --set "hegel.trustedProxies={${trusted_proxies}}"
 ```
 
 These commands install the Tinkerbell Stack chart in the `tink-system` namespace with the release name of `stack-release`.