Skip to content

Commit 7b1488e

Browse files
committed
remove etcd-backup-server from static pod lists
1 parent 106d42f commit 7b1488e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bindata/etcd/cluster-restore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ BACKUP_FILE=$(ls -vd "${BACKUP_DIR}"/static_kuberesources*.tar.gz | tail -1) ||
6868
SNAPSHOT_FILE=$(ls -vd "${BACKUP_DIR}"/snapshot*.db | tail -1) || true
6969

7070
ETCD_STATIC_POD_LIST=("etcd-pod.yaml")
71-
ETCD_STATIC_POD_CONTAINERS=("etcd" "etcdctl" "etcd-metrics" "etcd-readyz" "etcd-rev" "etcd-backup-server")
71+
ETCD_STATIC_POD_CONTAINERS=("etcd" "etcdctl" "etcd-metrics" "etcd-readyz" "etcd-rev")
7272

7373
if [ ! -f "${SNAPSHOT_FILE}" ]; then
7474
echo "etcd snapshot ${SNAPSHOT_FILE} does not exist"

bindata/etcd/disable-etcd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ source_required_dependency /etc/kubernetes/static-pod-resources/etcd-certs/confi
2929
source_required_dependency /etc/kubernetes/static-pod-resources/etcd-certs/configmaps/etcd-scripts/etcd-common-tools
3030

3131
ETCD_STATIC_POD_LIST=("etcd-pod.yaml")
32-
ETCD_STATIC_POD_CONTAINERS=("etcd" "etcdctl" "etcd-metrics" "etcd-readyz" "etcd-rev" "etcd-backup-server")
32+
ETCD_STATIC_POD_CONTAINERS=("etcd" "etcdctl" "etcd-metrics" "etcd-readyz" "etcd-rev")
3333

3434
# always move etcd pod and wait for all containers to exit
3535
mv_static_pods "${ETCD_STATIC_POD_LIST[@]}"

bindata/etcd/quorum-restore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ source_required_dependency /etc/kubernetes/static-pod-resources/etcd-certs/confi
2828
source_required_dependency /etc/kubernetes/static-pod-resources/etcd-certs/configmaps/etcd-scripts/etcd-common-tools
2929

3030
ETCD_STATIC_POD_LIST=("etcd-pod.yaml")
31-
ETCD_STATIC_POD_CONTAINERS=("etcd" "etcdctl" "etcd-metrics" "etcd-readyz" "etcd-rev" "etcd-backup-server")
31+
ETCD_STATIC_POD_CONTAINERS=("etcd" "etcdctl" "etcd-metrics" "etcd-readyz" "etcd-rev")
3232

3333
# always move etcd pod and wait for all containers to exit
3434
mv_static_pods "${ETCD_STATIC_POD_LIST[@]}"

0 commit comments

Comments
 (0)