Merge pull request #4218 from CecileRobertMichon/cherry-pick-e83ea53-…

…1.10 [release-1.10] Restart containerd in ipv6 templates when restarting systemd-resolved
kubernetes-sigs · Nov 1, 2023 · 8cb9b90 · 8cb9b90
2 parents a7111e1 + 47695c8
commit 8cb9b90
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
diff --git 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
@@ -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