-
Kubernetes Submit Queue authored
Automatic merge from submit-queue (batch tested with PRs 62642, 62855, 62487, 62858, 62873). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. build/rpms: fix kubeadm rpm **What this PR does / why we need it**: Change #61633 doesn't seem quite correct, and breaks bazel builds. This patch makes sure that: - there is no conflict between directory files and build targets - rpm files are properly packaged after being installed **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: I'm not sure how the previous attempt passed CI, but the corollary is that the status for this one might be considered suspect as well. **Release note**: ```release-note NONE ```