External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-05 18:51:13 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove rkt support (#4671)

Browse Source
This commit is contained in:
Andreas Krüger
2019-04-29 10:14:20 +02:00
committed by Kubernetes Prow Robot
parent 741de6051c
commit 38af93b60c
32 changed files with 7 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
View File

@@ -18,8 +18,6 @@ nodeRegistration:
name: {{ kube_override_hostname }}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}

2
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2
View File

@@ -18,8 +18,6 @@ nodeRegistration:
name: {{ kube_override_hostname }}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}

2
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
View File

@@ -16,8 +16,6 @@ nodeRegistration:
name: {{ kube_override_hostname }}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

@@ -230,8 +230,6 @@ nodeRegistration:
{% endif %}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View File

@@ -16,8 +16,6 @@ nodeRegistration:
{% endif %}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}

2
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View File

@@ -16,8 +16,6 @@ nodeRegistration:
{% endif %}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}

2
roles/kubernetes/master/templates/kubeadm-controlplane.v1beta1.yaml.j2
View File

@@ -19,8 +19,6 @@ nodeRegistration:
name: {{ inventory_hostname }}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}