From 898320bba803f1774bd15cfe6e3b25da46103010 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yhodique@google.com>
Date: Wed, 18 Apr 2018 15:25:15 -0700
Subject: [PATCH] build/rpms: fix kubeadm rpm

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
---
 build/rpms/BUILD                    | 1 +
 build/rpms/kubeadm.spec             | 4 +++-
 build/rpms/{kubelet => kubelet.env} | 0
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename build/rpms/{kubelet => kubelet.env} (100%)

diff --git a/build/rpms/BUILD b/build/rpms/BUILD
index 5db49c0a19..ce8c27eb2e 100644
--- 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",
diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec
index 0430ceaca7..3de4b129e3 100644
--- 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
diff --git a/build/rpms/kubelet b/build/rpms/kubelet.env
similarity index 100%
rename from build/rpms/kubelet
rename to build/rpms/kubelet.env