Browse Source

Fix shell special vars

pull/1061/head
Ivan Shvedunov 7 years ago
parent
commit
0006e5ab45
3 changed files with 3 additions and 3 deletions
  1. 2
      roles/kubernetes/node/templates/kubelet-container.j2
  2. 2
      roles/network_plugin/calico/templates/calicoctl-container.j2
  3. 2
      roles/network_plugin/canal/templates/calicoctl-container.j2

2
roles/kubernetes/node/templates/kubelet-container.j2

@ -25,4 +25,4 @@
-v {{kube_config_dir}}:{{kube_config_dir}}:ro \
{{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \
./hyperkube kubelet \
$@
"$@"

2
roles/network_plugin/calico/templates/calicoctl-container.j2

@ -11,4 +11,4 @@
-v {{ calico_cert_dir }}:{{ calico_cert_dir }}:ro \
--memory={{ calicoctl_memory_limit|regex_replace('Mi', 'M') }} --cpu-shares={{ calicoctl_cpu_limit|regex_replace('m', '') }} \
{{ calicoctl_image_repo }}:{{ calicoctl_image_tag}} \
$@
"$@"

2
roles/network_plugin/canal/templates/calicoctl-container.j2

@ -12,4 +12,4 @@
-v {{ canal_policy_dir }}:{{ canal_policy_dir }}:ro \
--memory={{ calicoctl_memory_limit|regex_replace('Mi', 'M') }} --cpu-shares={{ calicoctl_cpu_limit|regex_replace('m', '') }} \
{{ calicoctl_image_repo }}:{{ calicoctl_image_tag}} \
$@
"$@"
Loading…
Cancel
Save