Automatic merge from submit-queue

Update etcd makefile to build 3.0.4

Bumps the dependency, but we will also need someone to push to the google repos too.  

/cc @kubernetes/sig-scalability  

xref: #29235 #29399

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30309)
<!-- Reviewable:end -->