Skip to content

DR start_static_pods: reread a list of static pods when starting them #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
May 20, 2019
Merged

DR start_static_pods: reread a list of static pods when starting them #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3be74
DR start_static_pods: reread a list of static pods when starting them
May 20, 2019
8554f3a
Store stopped manifests in ASSET_DIR
May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/master/00-master/_base/files/usr-local-bin-etcd-member-recover-sh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ contents:
ASSET_DIR_TMP="$ASSET_DIR/tmp"
CONFIG_FILE_DIR=/etc/kubernetes
MANIFEST_DIR="${CONFIG_FILE_DIR}/manifests"
MANIFEST_STOPPED_DIR=/etc/kubernetes/manifests-stopped


MANIFEST_STOPPED_DIR="$ASSET_DIR/manifests-stopped"
ETCD_MANIFEST="${MANIFEST_DIR}/etcd-member.yaml"
ETCD_CONFIG=/etc/etcd/etcd.conf
ETCDCTL=$ASSET_DIR/bin/etcdctl
Expand Down
2 changes: 1 addition & 1 deletion templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-backup-sh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ contents:

CONFIG_FILE_DIR=/etc/kubernetes
MANIFEST_DIR="${CONFIG_FILE_DIR}/manifests"
MANIFEST_STOPPED_DIR="${CONFIG_FILE_DIR}/manifests-stopped"
MANIFEST_STOPPED_DIR="${ASSET_DIR}/manifests-stopped"
ETCD_VERSION=v3.3.10
ETCDCTL="${ASSET_DIR}/bin/etcdctl"
ETCD_DATA_DIR=/var/lib/etcd
Expand Down
2 changes: 1 addition & 1 deletion templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-restore-sh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ contents:

CONFIG_FILE_DIR=/etc/kubernetes
MANIFEST_DIR="${CONFIG_FILE_DIR}/manifests"
MANIFEST_STOPPED_DIR="${CONFIG_FILE_DIR}/manifests-stopped"
MANIFEST_STOPPED_DIR="${ASSET_DIR}/manifests-stopped"
ETCD_VERSION=v3.3.10
ETCDCTL="${ASSET_DIR}/bin/etcdctl"
ETCD_DATA_DIR=/var/lib/etcd
Expand Down
1 change: 1 addition & 0 deletions templates/master/00-master/_base/files/usr-local-bin-openshift-recovery-tools-sh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ contents:

start_static_pods() {
echo "Starting static pods.."
find ${MANIFEST_STOPPED_DIR} -maxdepth 1 -type f -printf "%f\n" > $STOPPED_STATIC_PODS
while read STATIC_POD; do
echo "..starting $STATIC_POD"
mv ${MANIFEST_STOPPED_DIR}/${STATIC_POD} $MANIFEST_DIR
Expand Down