Merge pull request #91756 from wojtek-t/remove_etcd_empty_dir_cleanup
Remove etcd-empty-dir-cleanup image
This commit is contained in:
@@ -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
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user