[Backport release-1.29] Backport etcd join workflow fix from #5151

[Backport release-1.29] Backport etcd join workflow fix from #5151 #9220