mirror of https://github.com/k3s-io/k3s
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 installedpull/8/head
parent
4761788b2a
commit
898320bba8
|
@ -31,6 +31,7 @@ pkg_rpm(
|
||||||
changelog = "//:CHANGELOG.md",
|
changelog = "//:CHANGELOG.md",
|
||||||
data = [
|
data = [
|
||||||
"10-kubeadm.conf",
|
"10-kubeadm.conf",
|
||||||
|
"kubelet.env",
|
||||||
"//cmd/kubeadm",
|
"//cmd/kubeadm",
|
||||||
],
|
],
|
||||||
spec_file = "kubeadm.spec",
|
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}%{_bindir}
|
||||||
install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
|
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}/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}%{_bindir} kubeadm
|
||||||
install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ 10-kubeadm.conf
|
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
|
%files
|
||||||
%{_bindir}/kubeadm
|
%{_bindir}/kubeadm
|
||||||
%{_sysconfdir}/systemd/system/kubelet.service.d/10-kubeadm.conf
|
%{_sysconfdir}/systemd/system/kubelet.service.d/10-kubeadm.conf
|
||||||
|
%{_sysconfdir}/sysconfig/kubelet
|
||||||
|
|
Loading…
Reference in New Issue