Skip to content

K
k3s
Unverified Commit 2d7b3861 authored by Duffie Cooley's avatar Duffie Cooley
Browse files
Options

Add conntrack as a dependency of kubelet

FIXES: https://github.com/kubernetes/kubeadm/issues/1287 - This commit integrates the work of @jdetiber to fix bazel build //build/rpms and also addresses an issue where not all common versions of rpmbuild have the %{_sysctldir} macro. - Since that macro points to /usr/lib/sysctl.d this commit just points directly to that dir. - This also adds conntrack as a dependency of kubelet for both rpm and deb builds. Signed-off-by: 's avatarDuffie Cooley <dcooley@heptio.com>
parent 3ee10e9c
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
build/debs/BUILD
View file @ 2d7b3861
...@@ -148,14 +148,15 @@ k8s_deb( ...@@ -148,14 +148,15 @@ k8s_deb(
k8s_deb( k8s_deb(
name = "kubelet", name = "kubelet",
depends = [ depends = [
"conntrack",
"ebtables",
"ethtool",
"iproute2",
"iptables (>= 1.4.21)", "iptables (>= 1.4.21)",
"kubernetes-cni (>= 0.6.0)", "kubernetes-cni (>= 0.6.0)",
"iproute2", "mount",
"socat", "socat",
"util-linux", "util-linux",
"mount",
"ebtables",
"ethtool",
], ],
description = """Kubernetes Node Agent description = """Kubernetes Node Agent
The node agent of Kubernetes, the container cluster manager The node agent of Kubernetes, the container cluster manager
...@@ -168,7 +169,7 @@ k8s_deb( ...@@ -168,7 +169,7 @@ k8s_deb(
depends = [ depends = [
"kubelet (>= 1.8.0)", "kubelet (>= 1.8.0)",
"kubectl (>= 1.8.0)", "kubectl (>= 1.8.0)",
"kubernetes-cni (>= 0.5.1)", "kubernetes-cni (>= 0.6.0)",
"cri-tools (>= 1.11.0)", "cri-tools (>= 1.11.0)",
], ],
description = """Kubernetes Cluster Bootstrapping Tool description = """Kubernetes Cluster Bootstrapping Tool
......
build/rpms/kubeadm.spec
View file @ 2d7b3861
...@@ -5,7 +5,7 @@ License: ASL 2.0 ...@@ -5,7 +5,7 @@ License: ASL 2.0
Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool
Requires: kubelet >= 1.8.0 Requires: kubelet >= 1.8.0
Requires: kubectl >= 1.8.0 Requires: kubectl >= 1.8.0
Requires: kubernetes-cni >= 0.5.1 Requires: kubernetes-cni >= 0.6.0
Requires: cri-tools >= 1.11.0 Requires: cri-tools >= 1.11.0
URL: https://kubernetes.io URL: https://kubernetes.io
...@@ -22,9 +22,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm} ...@@ -22,9 +22,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm}
install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf} install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
install -p -m 644 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet install -p -m 644 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
mkdir -p %{buildroot}%{_libexecdir}/modules-load.d mkdir -p %{buildroot}%{_libexecdir}/modules-load.d
mkdir -p %{buildroot}%{_sysctldir} mkdir -p %{buildroot}/usr/lib/sysctl.d/
install -p -m 0644 -t %{buildroot}%{_libexecdir}/modules-load.d/ {kubeadm.conf} install -p -m 0644 -t %{buildroot}%{_libexecdir}/modules-load.d/ {kubeadm.conf}
install -p -m 0644 -t %{buildroot}%{_sysctldir} {50-kubeadm.conf} install -p -m 0644 -t %{buildroot}/usr/lib/sysctl.d/ {50-kubeadm.conf}
%files %files
%{_bindir}/kubeadm %{_bindir}/kubeadm
...@@ -32,4 +32,4 @@ install -p -m 0644 -t %{buildroot}%{_sysctldir} {50-kubeadm.conf} ...@@ -32,4 +32,4 @@ install -p -m 0644 -t %{buildroot}%{_sysctldir} {50-kubeadm.conf}
%{_sysconfdir}/sysconfig/kubelet %{_sysconfdir}/sysconfig/kubelet
%dir %{_libexecdir}/modules-load.d %dir %{_libexecdir}/modules-load.d
%{_libexecdir}/modules-load.d/kubeadm.conf %{_libexecdir}/modules-load.d/kubeadm.conf
%{_sysctldir}/50-kubeadm.conf /usr/lib/sysctl.d/50-kubeadm.conf
build/rpms/kubelet.spec
View file @ 2d7b3861
...@@ -6,13 +6,14 @@ Summary: Container Cluster Manager - Kubernetes Node Agent ...@@ -6,13 +6,14 @@ Summary: Container Cluster Manager - Kubernetes Node Agent
URL: https://kubernetes.io URL: https://kubernetes.io
Requires: conntrack
Requires: ebtables
Requires: ethtool
Requires: iproute
Requires: iptables >= 1.4.21 Requires: iptables >= 1.4.21
Requires: kubernetes-cni >= 0.6.0 Requires: kubernetes-cni >= 0.6.0
Requires: socat Requires: socat
Requires: util-linux Requires: util-linux
Requires: ethtool
Requires: iproute
Requires: ebtables
%description %description
The node agent of Kubernetes, the container cluster manager. The node agent of Kubernetes, the container cluster manager.
......
build/rpms/kubernetes-cni.spec
View file @ 2d7b3861
...@@ -3,7 +3,6 @@ Version: OVERRIDE_THIS ...@@ -3,7 +3,6 @@ Version: OVERRIDE_THIS
Release: 00 Release: 00
License: ASL 2.0 License: ASL 2.0
Summary: Container Cluster Manager - CNI plugins Summary: Container Cluster Manager - CNI plugins
URL: https://kubernetes.io URL: https://kubernetes.io
%description %description
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment