mirror of
https://github.com/puppetmaster/typhoon.git
synced 2025-07-30 09:41:35 +02:00
Remove workaround for preventing search . propagation
* Kubelet v1.25.1 has the fix https://github.com/kubernetes/kubernetes/pull/112157
This commit is contained in:
@ -124,21 +124,6 @@ systemd:
|
||||
$${KUBELET_IMAGE}
|
||||
ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done
|
||||
ExecStartPost=-/usr/bin/podman stop bootstrap
|
||||
- name: fix-resolv-conf-search.service
|
||||
enabled: true
|
||||
contents: |
|
||||
[Unit]
|
||||
Description=Remove search . from /etc/resolv.conf
|
||||
DefaultDependencies=no
|
||||
Requires=systemd-resolved.service
|
||||
After=systemd-resolved.service
|
||||
BindsTo=systemd-resolved.service
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStartPre=/usr/bin/sleep 5
|
||||
ExecStart=/usr/bin/sed -i -e "s/^search .$//" /run/systemd/resolve/resolv.conf
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
storage:
|
||||
directories:
|
||||
- path: /var/lib/etcd
|
||||
|
@ -81,21 +81,6 @@ systemd:
|
||||
PathExists=/etc/kubernetes/kubeconfig
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
- name: fix-resolv-conf-search.service
|
||||
enabled: true
|
||||
contents: |
|
||||
[Unit]
|
||||
Description=Remove search . from /etc/resolv.conf
|
||||
DefaultDependencies=no
|
||||
Requires=systemd-resolved.service
|
||||
After=systemd-resolved.service
|
||||
BindsTo=systemd-resolved.service
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStartPre=/usr/bin/sleep 5
|
||||
ExecStart=/usr/bin/sed -i -e "s/^search .$//" /run/systemd/resolve/resolv.conf
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
storage:
|
||||
directories:
|
||||
- path: /etc/kubernetes
|
||||
|
Reference in New Issue
Block a user