Remove unnecessary and risky reload network for resolvconf propagation (#5322)

Change-Id: I54d706f7941b4b86c4c6cd45340295577155b884
This commit is contained in:
Matthew Mosesohn
2019-11-06 21:11:52 +03:00
committed by Kubernetes Prow Robot
parent a005d19f6f
commit 1c25ed669c
4 changed files with 9 additions and 24 deletions

View File

@@ -1,8 +1,7 @@
---
- name: Preinstall | restart network
- name: Preinstall | propagate resolvconf to k8s components
command: /bin/true
notify:
- Preinstall | reload network
- Preinstall | reload kubelet
- Preinstall | kube-controller configured
- Preinstall | kube-apiserver configured
@@ -12,20 +11,6 @@
- Preinstall | restart kube-apiserver crio/containerd
when: not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
# FIXME(bogdando) https://github.com/projectcalico/felix/issues/1185
- name: Preinstall | reload network
service:
name: >-
{% if ansible_os_family == "RedHat" -%}
network
{%- elif ansible_distribution == "Ubuntu" and ansible_distribution_release == "bionic" -%}
systemd-networkd
{%- elif ansible_os_family == "Debian" -%}
networking
{%- endif %}
state: restarted
when: not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] and kube_network_plugin not in ['canal', 'calico']
- name: Preinstall | update resolvconf for Container Linux by CoreOS
command: /bin/true
notify: