Fix bug in passing conditional test_flags in vtctld k8s template.

When test_flags were empty that resulted in an empty line in the template.
Kubernetes seem to have special treatment for that and it resulted in a new line
after the -etcd_global_addrs flag before the backup flags. And that resulted in
vtctld not seeing the backup flags at all (new line == next command).
For some reason putting test_flags and backup_flags on the same line in that
order resulted in the same behavior (when test_flags is empty the line has extra
space in the beginning of the line and Kubernetes inserts new line before it),
so I'm reversing their order.

The bug was introduced by https://github.com/youtube/vitess/pull/1809, in the
commit https://github.com/youtube/vitess/commit/3d82402706.
This commit is contained in:
Pavel Ivanov 2016-06-29 15:38:43 -07:00
Родитель 0dfece914c
Коммит 03e370bda0
1 изменённых файлов: 1 добавлений и 2 удалений

Просмотреть файл

@ -49,8 +49,7 @@ spec:
-service_map 'grpc-vtctl'
-topo_implementation etcd
-etcd_global_addrs http://etcd-global:4001
{{test_flags}}
{{backup_flags}}" vitess
{{backup_flags}} {{test_flags}}" vitess
volumes:
- name: syslog
hostPath: {path: /dev/log}