mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-14 21:53:52 +00:00
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 ```
This commit is contained in:
@@ -31,6 +31,7 @@ pkg_rpm(
|
||||
changelog = "//:CHANGELOG.md",
|
||||
data = [
|
||||
"10-kubeadm.conf",
|
||||
"kubelet.env",
|
||||
"//cmd/kubeadm",
|
||||
],
|
||||
spec_file = "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
|
||||
|
Reference in New Issue
Block a user