diff --git a/templates/master/00-master/_base/files/usr-local-bin-etcd-member-add-sh.yaml b/templates/master/00-master/_base/files/usr-local-bin-etcd-member-add-sh.yaml index 59f27ed69c..e8f0be813e 100644 --- a/templates/master/00-master/_base/files/usr-local-bin-etcd-member-add-sh.yaml +++ b/templates/master/00-master/_base/files/usr-local-bin-etcd-member-add-sh.yaml @@ -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" diff --git a/templates/master/00-master/_base/files/usr-local-bin-etcd-member-recover-sh.yaml b/templates/master/00-master/_base/files/usr-local-bin-etcd-member-recover-sh.yaml index 6080239a67..073897eaa0 100644 --- a/templates/master/00-master/_base/files/usr-local-bin-etcd-member-recover-sh.yaml +++ b/templates/master/00-master/_base/files/usr-local-bin-etcd-member-recover-sh.yaml @@ -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" diff --git a/templates/master/00-master/_base/files/usr-local-bin-etcd-member-remove-sh.yaml b/templates/master/00-master/_base/files/usr-local-bin-etcd-member-remove-sh.yaml index 68946e10d8..0bf738e9e6 100644 --- a/templates/master/00-master/_base/files/usr-local-bin-etcd-member-remove-sh.yaml +++ b/templates/master/00-master/_base/files/usr-local-bin-etcd-member-remove-sh.yaml @@ -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 diff --git a/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-backup-sh.yaml b/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-backup-sh.yaml index f4a65bd43a..566d52beb2 100644 --- a/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-backup-sh.yaml +++ b/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-backup-sh.yaml @@ -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" diff --git a/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-restore-sh.yaml b/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-restore-sh.yaml index f9bde029ef..49d840e2d5 100644 --- a/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-restore-sh.yaml +++ b/templates/master/00-master/_base/files/usr-local-bin-etcd-snapshot-restore-sh.yaml @@ -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" diff --git a/templates/master/00-master/_base/files/usr-local-bin-openshift-recovery-tools-sh.yaml b/templates/master/00-master/_base/files/usr-local-bin-openshift-recovery-tools-sh.yaml index 4c9c5e9fa9..c89fe449f9 100644 --- a/templates/master/00-master/_base/files/usr-local-bin-openshift-recovery-tools-sh.yaml +++ b/templates/master/00-master/_base/files/usr-local-bin-openshift-recovery-tools-sh.yaml @@ -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"