mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	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
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