From 90782ea820478e1e50f85c68113241e47c73f872 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Mon, 19 Sep 2022 22:20:50 -0700
Subject: [PATCH] Remove workaround for preventing search . propagation

* Kubelet v1.25.1 has the fix https://github.com/kubernetes/kubernetes/pull/112157
---
 CHANGES.md                                        |  4 ++++
 .../kubernetes/butane/controller.yaml             | 15 ---------------
 .../fedora-coreos/kubernetes/butane/worker.yaml   | 15 ---------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3750449b..ac64e3fc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,8 @@ Notable changes between versions.
 
 ## Latest
 
+## v1.25.1
+
 * Kubernetes [v1.25.1](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.25.md#v1251)
 * Update etcd from v3.5.4 to [v3.5.5](https://github.com/etcd-io/etcd/releases/tag/v3.5.5)
 * Update Cilium from v1.12.1 to [v1.12.2](https://github.com/cilium/cilium/releases/tag/v1.12.2)
@@ -12,6 +14,8 @@ Notable changes between versions.
   * Fix issue where non-critical pods are left in Error/Completed state on node shutdown
 * Remove feature flag disable workaround for [kubernetes/kubernetes#112081](https://github.com/kubernetes/kubernetes/issues/112081)
   * Kubernetes [reverted](https://github.com/kubernetes/kubernetes/pull/112078) `LocalStorageCapacityIsolationFSQuotaMonitoring` back to alpha
+* Remove workaround for preventing `search .` propagation in [kubernetes/kubernetes#112135](https://github.com/kubernetes/kubernetes/issues/112135)
+  * Upstream Kubernetes [fix](https://github.com/kubernetes/kubernetes/pull/112157)
 
 ### Addons
 
diff --git a/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml b/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml
index 6046966c..7d2bb4ff 100644
--- a/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml
+++ b/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml
@@ -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
diff --git a/bare-metal/fedora-coreos/kubernetes/butane/worker.yaml b/bare-metal/fedora-coreos/kubernetes/butane/worker.yaml
index 1711c551..5acec929 100644
--- a/bare-metal/fedora-coreos/kubernetes/butane/worker.yaml
+++ b/bare-metal/fedora-coreos/kubernetes/butane/worker.yaml
@@ -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