Skip to content

Commit

Permalink
BUG: haproxy: Fix invalid YAML from #252 PR
Browse files Browse the repository at this point in the history
Signed-off-by: Dinko Korunic <[email protected]>
  • Loading branch information
dkorunic committed Aug 7, 2024
1 parent e568719 commit 7d5c5bf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions haproxy/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ spec:
env:
{{- toYaml . | trim | nindent 12 }}
{{- end }}
{ { - with .Values.extraEnvFrom } }
{{- with .Values.extraEnvFrom }}
envFrom:
{ { - toYaml . | trim | nindent 12 } }
{ { - end } }
{{- toYaml . | trim | nindent 12 }}
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.lifecycle }}
Expand Down
6 changes: 3 additions & 3 deletions haproxy/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ spec:
env:
{{- toYaml . | trim | nindent 12 }}
{{- end }}
{ { - with .Values.extraEnvFrom } }
{{- with .Values.extraEnvFrom }}
envFrom:
{ { - toYaml . | trim | nindent 12 } }
{ { - end } }
{{- toYaml . | trim | nindent 12 }}
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.lifecycle }}
Expand Down
2 changes: 1 addition & 1 deletion haproxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ extraEnvs: []
# fieldRef:
# fieldPath: status.podIP

## Use envFrom to add env vars from a secret or configmap to the HA Proxy container
## Use envFrom to add env vars from a secret or ConfigMap to the HAProxy container
## ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
extraEnvFrom: []
## Example passing the pod IP into a container
Expand Down

0 comments on commit 7d5c5bf

Please sign in to comment.