Skip to content
Snippets Groups Projects
Commit faedfb63 authored by Matthew Mosesohn's avatar Matthew Mosesohn
Browse files

remove broken endifs in kubelet rkt mode

parent 7e140e5f
Branches
Tags
No related merge requests found
...@@ -61,7 +61,6 @@ ExecStart=/usr/bin/rkt run \ ...@@ -61,7 +61,6 @@ ExecStart=/usr/bin/rkt run \
--mount volume=var-lib-cni,target=/var/lib/cni \ --mount volume=var-lib-cni,target=/var/lib/cni \
{% if kube_network_plugin in ["calico", "canal"] %} {% if kube_network_plugin in ["calico", "canal"] %}
--mount volume=var-lib-calico,target=/var/lib/calico \ --mount volume=var-lib-calico,target=/var/lib/calico \
{% endif %}
{% endif %} {% endif %}
--mount volume=os-release,target=/etc/os-release \ --mount volume=os-release,target=/etc/os-release \
--mount volume=dns,target=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \
...@@ -86,7 +85,6 @@ ExecStart=/usr/bin/rkt run \ ...@@ -86,7 +85,6 @@ ExecStart=/usr/bin/rkt run \
{# Not pretty, but needed to avoid double mount #} {# Not pretty, but needed to avoid double mount #}
{% if local_volume_provisioner_base_dir not in local_volume_provisioner_mount_dir and local_volume_provisioner_mount_dir not in local_volume_provisioner_base_dir %} {% if local_volume_provisioner_base_dir not in local_volume_provisioner_mount_dir and local_volume_provisioner_mount_dir not in local_volume_provisioner_base_dir %}
--mount volume=local-volume-provisioner-mount-dir,target={{ local_volume_provisioner_mount_dir }} \ --mount volume=local-volume-provisioner-mount-dir,target={{ local_volume_provisioner_mount_dir }} \
{% endif %}
{% endif %} {% endif %}
--stage1-from-dir=stage1-fly.aci \ --stage1-from-dir=stage1-fly.aci \
{% if kube_hyperkube_image_repo == "docker" %} {% if kube_hyperkube_image_repo == "docker" %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment