Merge pull request #35783 from wojtek-t/support_rollback

Automatic merge from submit-queue

Better logging and support for running non-default version from etcd image

Ref #20504

hack/test-update-storage-objects.sh

@@ -165,6 +165,7 @@ TARGET_STORAGE="etcd3" \
   ETCD=$(which etcd) \
   ETCDCTL=$(which etcdctl) \
   ATTACHLEASE="${KUBE_OUTPUT_HOSTBIN}/attachlease" \
+  DO_NOT_MOVE_BINARIES="true" \
   ${KUBE_ROOT}/cluster/images/etcd/migrate-if-needed.sh
 kube::etcd::start