Skip to content

Bug 1770269: DR: etcdctl version should match with what is shipped with product #1272

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
merged 1 commit into from
Nov 19, 2019
Merged

Bug 1770269: DR: etcdctl version should match with what is shipped with product #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion templates/master/00-master/_base/files/usr-local-bin-etcd-member-add-sh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ contents:
ETCD_MANIFEST="${MANIFEST_DIR}/etcd-member.yaml"
ETCD_CONFIG=$RUN_ENV
ETCDCTL=$ASSET_DIR/bin/etcdctl
ETCD_VERSION=v3.3.10
ETCD_DATA_DIR=/var/lib/etcd
ETCD_STATIC_RESOURCES="${CONFIG_FILE_DIR}/static-pod-resources/etcd-member"

Expand Down
1 change: 0 additions & 1 deletion 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 @@ -43,7 +43,6 @@ contents:
ETCD_MANIFEST="${MANIFEST_DIR}/etcd-member.yaml"
ETCD_CONFIG=$RUN_ENV
ETCDCTL=$ASSET_DIR/bin/etcdctl
ETCD_VERSION=v3.3.10
ETCD_DATA_DIR=/var/lib/etcd
ETCD_STATIC_RESOURCES="${CONFIG_FILE_DIR}/static-pod-resources/etcd-member"

Expand Down
1 change: 0 additions & 1 deletion templates/master/00-master/_base/files/usr-local-bin-etcd-member-remove-sh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ contents:
ASSET_DIR=./assets
ASSET_DIR_TMP="$ASSET_DIR/tmp"
ETCDCTL=$ASSET_DIR/bin/etcdctl
ETCD_VERSION=v3.3.10
ETCD_DATA_DIR=/var/lib/etcd
CONFIG_FILE_DIR=/etc/kubernetes

Expand Down
1 change: 0 additions & 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 @@ -32,7 +32,6 @@ contents:
CONFIG_FILE_DIR=/etc/kubernetes
MANIFEST_DIR="${CONFIG_FILE_DIR}/manifests"
MANIFEST_STOPPED_DIR="${ASSET_DIR}/manifests-stopped"
ETCD_VERSION=v3.3.10
ETCDCTL="${ASSET_DIR}/bin/etcdctl"
ETCD_DATA_DIR=/var/lib/etcd
ETCD_MANIFEST="${MANIFEST_DIR}/etcd-member.yaml"
Expand Down
1 change: 0 additions & 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 @@ -33,7 +33,6 @@ contents:
MANIFEST_STOPPED_DIR="${ASSET_DIR}/manifests-stopped"
RUN_ENV=/run/etcd/environment

ETCD_VERSION=v3.3.10
ETCDCTL="${ASSET_DIR}/bin/etcdctl"
ETCD_DATA_DIR=/var/lib/etcd
ETCD_MANIFEST="${MANIFEST_DIR}/etcd-member.yaml"
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 @@ -5,6 +5,7 @@ contents:
inline: |
#!/usr/bin/env bash
export ETCDCTL_API=3
export ETCD_VERSION=v3.3.17

ETCDCTL_WITH_TLS="$ETCDCTL --cert $ASSET_DIR/backup/etcd-client.crt --key $ASSET_DIR/backup/etcd-client.key --cacert $ASSET_DIR/backup/etcd-ca-bundle.crt"

Expand Down