Skip to content

Commit ce7d993

Browse files
author
retroflexer
committed
Make restore pod yaml specific to restoring node.
1 parent 5640c7d commit ce7d993

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

bindata/etcd/cluster-restore.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,17 @@ function extract_and_start_restore_etcd_pod() {
6363
fi
6464

6565
echo "starting restored etcd-pod.yaml"
66-
tar -O -xvf "${BACKUP_FILE}" -C "${MANIFEST_DIR}"/ "${BACKUP_POD_PATH}" > "${MANIFEST_DIR}"/etcd-pod.yaml
66+
tar -O -xvf "${BACKUP_FILE}" -C "${MANIFEST_DIR}"/ "${BACKUP_POD_PATH}" | \
67+
sed -e 's,export ETCD_NAME=.*$,export ETCD_NAME=${NODE_NODE_ENVVAR_NAME_ETCD_NAME},g' \
68+
-e 's,export ETCD_INITIAL_CLUSTER=.*$,export ETCD_INITIAL_CLUSTER="${ETCD_NAME}=https://${NODE_NODE_ENVVAR_NAME_ETCD_URL_HOST}:2380",g' \
69+
-e 's,export ETCD_NODE_PEER_URL=.*$,export ETCD_NODE_PEER_URL=https://${NODE_NODE_ENVVAR_NAME_ETCD_URL_HOST}:2380,g' \
70+
-e 's,--initial-advertise-peer-urls .*$,--initial-advertise-peer-urls $ETCD_NODE_PEER_URL \\,g' \
71+
-e 's,--initial-advertise-peer-urls=.*$,--initial-advertise-peer-urls=https://${NODE_NODE_ENVVAR_NAME_IP}:2380 \\,g' \
72+
-e 's,--cert-file=.*$,--cert-file=/etc/kubernetes/static-pod-certs/secrets/etcd-all-serving/etcd-serving-NODE_NAME.crt \\,g' \
73+
-e 's,--key-file=.*$,--key-file=/etc/kubernetes/static-pod-certs/secrets/etcd-all-serving/etcd-serving-NODE_NAME.key \\,g' \
74+
-e 's,--peer-cert-file=.*$,--peer-cert-file=/etc/kubernetes/static-pod-certs/secrets/etcd-all-peer/etcd-peer-NODE_NAME.crt \\,g' \
75+
-e 's,--peer-key-file=.*$,--peer-key-file=/etc/kubernetes/static-pod-certs/secrets/etcd-all-peer/etcd-peer-NODE_NAME.key \\,g' \
76+
-e 's,--advertise-client-urls=.*$,--advertise-client-urls=https://${NODE_NODE_ENVVAR_NAME_IP}:2379 \\,g' > "${MANIFEST_DIR}"/etcd-pod.yaml
6777
return 0
6878
}
6979

pkg/operator/etcd_assets/bindata.go

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)