Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use trustedProxies values as arrays #31

Closed
wants to merge 1 commit into from
Closed

Use trustedProxies values as arrays #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tinkerbell/boots/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
{{- end }}
env:
- name: TRUSTED_PROXIES
value: {{ required "missing trustedProxies" .Values.trustedProxies | quote }}
value: {{ join "," .Values.trustedProxies }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
value: {{ join "," .Values.trustedProxies }}
value: {{ required "missing trustedProxies" (join "," .Values.trustedProxies | quote) }}

{{- range $i, $env := .Values.env }}
- name: {{ $env.name | quote }}
value: {{ $env.value | quote }}
Expand Down
2 changes: 1 addition & 1 deletion tinkerbell/boots/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ roleBindingName: boots-rolebinding
deployment:
strategy:
type: Recreate
trustedProxies: ""
trustedProxies: []
ports:
- name: boots-dhcp
port: 67
Expand Down
2 changes: 1 addition & 1 deletion tinkerbell/hegel/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
{{- end }}
env:
- name: HEGEL_TRUSTED_PROXIES
value: {{ required "missing trustedProxies" .Values.trustedProxies | quote }}
value: {{ join "," .Values.trustedProxies }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
value: {{ join "," .Values.trustedProxies }}
value: {{ required "missing trustedProxies" (join "," .Values.trustedProxies | quote) }}

{{- range $i, $env := .Values.env }}
- name: {{ $env.name | quote }}
value: {{ $env.value | quote }}
Expand Down
2 changes: 1 addition & 1 deletion tinkerbell/hegel/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
deploy: true
trustedProxies: ""
trustedProxies: []
name: hegel
image: quay.io/tinkerbell/hegel:v0.10.1
imagePullPolicy: IfNotPresent
Expand Down
4 changes: 2 additions & 2 deletions tinkerbell/stack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`.
Expand Down