Remove all references to etcd-empty-dir-cleanup.

This commit is contained in:
wojtekt 2020-06-05 08:40:58 +02:00
parent 4f5ce1fa88
commit ee27e5b8be
5 changed files with 0 additions and 31 deletions

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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",

View File

@ -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