C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3247 from mattymo/kubelet_rkt_Fix

Browse source 
remove broken endifs in kubelet rkt mode
This commit is contained in:
k8s-ci-robot 2018-09-06 02:49:35 -07:00 committed by GitHub
commit f5251f7d27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/node/templates/kubelet.rkt.service.j2
View file

@ -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 \
{# 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" %}