From ee27e5b8be630e4e2135b7004045d8b5be51d19e Mon Sep 17 00:00:00 2001
From: wojtekt <wojtekt@google.com>
Date: Fri, 5 Jun 2020 08:40:58 +0200
Subject: [PATCH] Remove all references to etcd-empty-dir-cleanup.

---
 build/dependencies.yaml                         |  6 ------
 build/lib/release.sh                            |  1 -
 cluster/gce/gci/configure-helper.sh             |  6 ------
 cluster/gce/manifests/BUILD                     |  1 -
 .../gce/manifests/etcd-empty-dir-cleanup.yaml   | 17 -----------------
 5 files changed, 31 deletions(-)
 delete mode 100644 cluster/gce/manifests/etcd-empty-dir-cleanup.yaml

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 080b470422b..62fe217b80c 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -50,12 +50,8 @@ dependencies:
       match: etcd_docker_tag|etcd_version
     - path: build/workspace.bzl
       match: ETCD_VERSION
-    - path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
-      match: k8s.gcr.io/etcd-empty-dir-cleanup
     - path: cluster/gce/upgrade-aliases.sh
       match: ETCD_IMAGE|ETCD_VERSION
-    - path: cluster/images/etcd-empty-dir-cleanup/Makefile
-      match: ETCD_VERSION|TAG
     - path: cluster/images/etcd/Makefile
       match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
     - path: cluster/images/etcd/migrate-if-needed.sh
@@ -100,8 +96,6 @@ dependencies:
       match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+
     - path: cluster/images/etcd/Makefile
       match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+
-    - path: cluster/images/etcd-empty-dir-cleanup/Dockerfile
-      match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+
 
   - name: "k8s.gcr.io/debian-iptables"
     version: 12.1.0
diff --git a/build/lib/release.sh b/build/lib/release.sh
index ec03f90dd49..dae9c21c8e5 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -434,7 +434,6 @@ function kube::release::package_kube_manifests_tarball() {
   cp "${src_dir}/kube-controller-manager.manifest" "${dst_dir}"
   cp "${src_dir}/kube-addon-manager.yaml" "${dst_dir}"
   cp "${src_dir}/glbc.manifest" "${dst_dir}"
-  cp "${src_dir}/etcd-empty-dir-cleanup.yaml" "${dst_dir}/"
   find "${src_dir}" -name 'internal-*' -exec cp {} "${dst_dir}" \;
   cp "${KUBE_ROOT}/cluster/gce/gci/configure-helper.sh" "${dst_dir}/gci-configure-helper.sh"
   cp "${KUBE_ROOT}/cluster/gce/gci/configure-kubeapiserver.sh" "${dst_dir}/configure-kubeapiserver.sh"
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index a9d0da9aa9f..c939362c06c 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1682,11 +1682,6 @@ function prepare-etcd-manifest {
   mv "${temp_file}" /etc/kubernetes/manifests
 }
 
-function start-etcd-empty-dir-cleanup-pod {
-  local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/etcd-empty-dir-cleanup.yaml"
-  cp "${src_file}" "/etc/kubernetes/manifests"
-}
-
 # Starts etcd server pod (and etcd-events pod if needed).
 # More specifically, it prepares dirs and files, sets the variable value
 # in the manifests, and copies them to /etc/kubernetes/manifests.
@@ -2929,7 +2924,6 @@ function main() {
     compute-master-manifest-variables
     if [[ -z "${ETCD_SERVERS:-}" ]]; then
       start-etcd-servers
-      start-etcd-empty-dir-cleanup-pod
     fi
     source ${KUBE_BIN}/configure-kubeapiserver.sh
     start-kube-apiserver
diff --git a/cluster/gce/manifests/BUILD b/cluster/gce/manifests/BUILD
index 9c7379aa26b..0e6f7f5a51d 100644
--- a/cluster/gce/manifests/BUILD
+++ b/cluster/gce/manifests/BUILD
@@ -16,7 +16,6 @@ filegroup(
         "abac-authz-policy.jsonl",
         "cluster-autoscaler.manifest",
         "etcd.manifest",
-        "etcd-empty-dir-cleanup.yaml",
         "glbc.manifest",
         "konnectivity-server.yaml",
         "kube-addon-manager.yaml",
diff --git a/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml b/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
deleted file mode 100644
index a1bc8f96464..00000000000
--- a/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: etcd-empty-dir-cleanup
-  namespace: kube-system
-  annotations:
-    seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
-  labels:
-    k8s-app: etcd-empty-dir-cleanup
-spec:
-  priorityClassName: system-node-critical
-  priority: 2000001000
-  hostNetwork: true
-  dnsPolicy: Default
-  containers:
-  - name: etcd-empty-dir-cleanup
-    image: k8s.gcr.io/etcd-empty-dir-cleanup:3.4.7.0