Skip to content
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

Jump to bottom

Manifest stopped dir should be created with "p" flag #248

Merged
merged 2 commits into from Mar 10, 2020
Merged

Manifest stopped dir should be created with "p" flag #248

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
779dd48
The data-dir should be /var/lib/etcd instead of /var/lib/etcd/member …
Mar 9, 2020
93a71d0
Manifest stopped dir should be created with -p flag
Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindata/etcd/etcd-snapshot-restore.sh
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ fi

# Move manifests and stop static pods
if [ ! -d "$MANIFEST_STOPPED_DIR" ]; then
mkdir $MANIFEST_STOPPED_DIR
mkdir -p $MANIFEST_STOPPED_DIR
fi

# Move static pod manifests out of MANIFEST_DIR
Expand Down
2 changes: 1 addition & 1 deletion bindata/etcd/pod.yaml
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ ${COMPUTED_ENV_VARS}
--cert=/etc/kubernetes/static-pod-certs/secrets/etcd-all-peer/etcd-peer-NODE_NAME.crt \
--key=/etc/kubernetes/static-pod-certs/secrets/etcd-all-peer/etcd-peer-NODE_NAME.key \
--endpoints=${ALL_ETCD_ENDPOINTS} \
--data-dir=/var/lib/etcd/member \
--data-dir=/var/lib/etcd \
--target-peer-url-host=${NODE_NODE_ENVVAR_NAME_ETCD_URL_HOST} \
--target-name=NODE_NAME)
export ETCD_INITIAL_CLUSTER
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/etcd_assets/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.