diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml index 1a72e1a0eca..bb9034fb186 100644 --- a/templates/cluster-template-dual-stack.yaml +++ b/templates/cluster-template-dual-stack.yaml @@ -128,7 +128,7 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd preKubeadmCommands: [] machineTemplate: infrastructureRef: @@ -240,4 +240,4 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml index caa7a12f41b..49d0e3837ca 100644 --- a/templates/cluster-template-ipv6.yaml +++ b/templates/cluster-template-ipv6.yaml @@ -133,7 +133,7 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd preKubeadmCommands: [] machineTemplate: infrastructureRef: @@ -256,4 +256,4 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd diff --git a/templates/flavors/dual-stack/machine-deployment.yaml b/templates/flavors/dual-stack/machine-deployment.yaml index f3c56ca609e..8b03448f8d9 100644 --- a/templates/flavors/dual-stack/machine-deployment.yaml +++ b/templates/flavors/dual-stack/machine-deployment.yaml @@ -49,7 +49,7 @@ spec: # This frees up :53 on the host for the coredns pods - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml b/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml index 29e0525e140..8c71bf6d83a 100644 --- a/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml +++ b/templates/flavors/dual-stack/patches/kubeadm-controlplane.yaml @@ -8,7 +8,7 @@ spec: # This frees up :53 on the host for the coredns pods - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd initConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/flavors/ipv6/machine-deployment.yaml b/templates/flavors/ipv6/machine-deployment.yaml index 617ea8e73f5..3b38e7f61b1 100644 --- a/templates/flavors/ipv6/machine-deployment.yaml +++ b/templates/flavors/ipv6/machine-deployment.yaml @@ -49,7 +49,7 @@ spec: # This frees up :53 on the host for the coredns pods - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml b/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml index 662d3d70acd..dff8d9cbb7b 100644 --- a/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml +++ b/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml @@ -8,7 +8,7 @@ spec: # This frees up :53 on the host for the coredns pods - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd initConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index cd735e156ed..9bcbe7b1d81 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -133,7 +133,7 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd preKubeadmCommands: [] machineTemplate: infrastructureRef: @@ -251,7 +251,7 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -323,4 +323,4 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index 378c835f9b8..ddabc094961 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -138,7 +138,7 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd preKubeadmCommands: [] machineTemplate: infrastructureRef: @@ -261,7 +261,7 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -343,4 +343,4 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd diff --git a/templates/test/ci/prow-dual-stack/machine-pool-dualstack.yaml b/templates/test/ci/prow-dual-stack/machine-pool-dualstack.yaml index 91c0427a0e7..de74108b093 100644 --- a/templates/test/ci/prow-dual-stack/machine-pool-dualstack.yaml +++ b/templates/test/ci/prow-dual-stack/machine-pool-dualstack.yaml @@ -68,4 +68,4 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd diff --git a/templates/test/ci/prow-ipv6/machine-pool-ipv6.yaml b/templates/test/ci/prow-ipv6/machine-pool-ipv6.yaml index 633ccaac961..d9c8a4b4048 100644 --- a/templates/test/ci/prow-ipv6/machine-pool-ipv6.yaml +++ b/templates/test/ci/prow-ipv6/machine-pool-ipv6.yaml @@ -78,4 +78,4 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - - systemctl restart systemd-resolved + - systemctl restart systemd-resolved containerd