Merge pull request #62873 from sigma/pr/fix-rpm

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 ```

Merge pull request #62873 from sigma/pr/fix-rpm
560e15fb · Kubernetes Submit Queue · GitHub · 019c805f · 898320bb · 560e15fb
Unverified Commit 560e15fb authored Apr 19, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

BUILD build/rpms/BUILD +1 -0

kubeadm.spec build/rpms/kubeadm.spec +3 -1

kubelet.env build/rpms/kubelet.env +0 -0

No files found.
--- a/build/rpms/BUILD
+++ b/build/rpms/BUILD
@@ -31,6 +31,7 @@ pkg_rpm(
    changelog = "//:CHANGELOG.md",
    data = [
        "10-kubeadm.conf",
+        "kubelet.env",
        "//cmd/kubeadm",
    ],
    spec_file = "kubeadm.spec",

--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -16,10 +16,12 @@ Command-line utility for deploying a Kubernetes cluster.
 install -m 755 -d %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 755 -t %{buildroot}%{_bindir} kubeadm
 install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ 10-kubeadm.conf
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/sysconfig/ kubelet
+install -p -m 755 -T kubelet.env %{buildroot}%{_sysconfdir}/sysconfig/kubelet
 %files
 %{_bindir}/kubeadm
 %{_sysconfdir}/systemd/system/kubelet.service.d/10-kubeadm.conf
+%{_sysconfdir}/sysconfig/kubelet
--- a/build/rpms/kubelet
+++ b/build/rpms/kubelet