summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-19 22:14:22 +0000
committerGerrit Code Review <review@openstack.org>2018-11-19 22:14:22 +0000
commit30b806a460c397d26ee459b3c4534417444aa69e (patch)
tree83ad5dc1b7410f0cdced43559d8365197b5b0880
parent956e2fb86244208dd537ba82f3b599f3a7ad5307 (diff)
parenteb00a0ddef31cafd201a4cd96a700d1fbbce8c54 (diff)
Merge "Fix incorrect templating in haproxy anchor script"
-rw-r--r--charts/haproxy/templates/bin/_anchor.tpl4
-rw-r--r--examples/basic/armada-resources.yaml1
2 files changed, 3 insertions, 2 deletions
diff --git a/charts/haproxy/templates/bin/_anchor.tpl b/charts/haproxy/templates/bin/_anchor.tpl
index 6e3ddd5..1b90f6a 100644
--- a/charts/haproxy/templates/bin/_anchor.tpl
+++ b/charts/haproxy/templates/bin/_anchor.tpl
@@ -126,9 +126,9 @@ cleanup() {
126while true; do 126while true; do
127 if [ -e /tmp/stop ]; then 127 if [ -e /tmp/stop ]; then
128 echo Stopping 128 echo Stopping
129 {%- if .Values.conf.anchor.enable_cleanup %} 129 {{- if .Values.conf.anchor.enable_cleanup }}
130 cleanup 130 cleanup
131 {%- end %} 131 {{- end }}
132 break 132 break
133 fi 133 fi
134 134
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 56fabd2..e31f326 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -607,6 +607,7 @@ data:
607 values: 607 values:
608 conf: 608 conf:
609 anchor: 609 anchor:
610 enable_cleanup: false
610 kubernetes_url: https://10.96.0.1:443 611 kubernetes_url: https://10.96.0.1:443
611 services: 612 services:
612 kube-system: 613 kube-system: