File tree Expand file tree Collapse file tree 5 files changed +0
-31
lines changed Expand file tree Collapse file tree 5 files changed +0
-31
lines changed Original file line number Diff line number Diff line change @@ -50,12 +50,8 @@ dependencies:
50
50
match : etcd_docker_tag|etcd_version
51
51
- path : build/workspace.bzl
52
52
match : ETCD_VERSION
53
- - path : cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
54
- match : k8s.gcr.io/etcd-empty-dir-cleanup
55
53
- path : cluster/gce/upgrade-aliases.sh
56
54
match : ETCD_IMAGE|ETCD_VERSION
57
- - path : cluster/images/etcd-empty-dir-cleanup/Makefile
58
- match : ETCD_VERSION|TAG
59
55
- path : cluster/images/etcd/Makefile
60
56
match : BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
61
57
- path : cluster/images/etcd/migrate-if-needed.sh
@@ -100,8 +96,6 @@ dependencies:
100
96
match : BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+
101
97
- path : cluster/images/etcd/Makefile
102
98
match : BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+
103
- - path : cluster/images/etcd-empty-dir-cleanup/Dockerfile
104
- match : us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+
105
99
106
100
- name : " k8s.gcr.io/debian-iptables"
107
101
version : 12.1.0
Original file line number Diff line number Diff line change @@ -434,7 +434,6 @@ function kube::release::package_kube_manifests_tarball() {
434
434
cp " ${src_dir} /kube-controller-manager.manifest" " ${dst_dir} "
435
435
cp " ${src_dir} /kube-addon-manager.yaml" " ${dst_dir} "
436
436
cp " ${src_dir} /glbc.manifest" " ${dst_dir} "
437
- cp " ${src_dir} /etcd-empty-dir-cleanup.yaml" " ${dst_dir} /"
438
437
find " ${src_dir} " -name ' internal-*' -exec cp {} " ${dst_dir} " \;
439
438
cp " ${KUBE_ROOT} /cluster/gce/gci/configure-helper.sh" " ${dst_dir} /gci-configure-helper.sh"
440
439
cp " ${KUBE_ROOT} /cluster/gce/gci/configure-kubeapiserver.sh" " ${dst_dir} /configure-kubeapiserver.sh"
Original file line number Diff line number Diff line change @@ -1682,11 +1682,6 @@ function prepare-etcd-manifest {
1682
1682
mv " ${temp_file} " /etc/kubernetes/manifests
1683
1683
}
1684
1684
1685
- function start-etcd-empty-dir-cleanup-pod {
1686
- local -r src_file=" ${KUBE_HOME} /kube-manifests/kubernetes/gci-trusty/etcd-empty-dir-cleanup.yaml"
1687
- cp " ${src_file} " " /etc/kubernetes/manifests"
1688
- }
1689
-
1690
1685
# Starts etcd server pod (and etcd-events pod if needed).
1691
1686
# More specifically, it prepares dirs and files, sets the variable value
1692
1687
# in the manifests, and copies them to /etc/kubernetes/manifests.
@@ -2929,7 +2924,6 @@ function main() {
2929
2924
compute-master-manifest-variables
2930
2925
if [[ -z " ${ETCD_SERVERS:- } " ]]; then
2931
2926
start-etcd-servers
2932
- start-etcd-empty-dir-cleanup-pod
2933
2927
fi
2934
2928
source ${KUBE_BIN} /configure-kubeapiserver.sh
2935
2929
start-kube-apiserver
Original file line number Diff line number Diff line change @@ -16,7 +16,6 @@ filegroup(
16
16
"abac-authz-policy.jsonl" ,
17
17
"cluster-autoscaler.manifest" ,
18
18
"etcd.manifest" ,
19
- "etcd-empty-dir-cleanup.yaml" ,
20
19
"glbc.manifest" ,
21
20
"konnectivity-server.yaml" ,
22
21
"kube-addon-manager.yaml" ,
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments