Merge pull request #71540 from mauilion/kubeadm_1287

Add conntrack as a dependency of kubelet

build/debs/BUILD

@@ -148,14 +148,15 @@ k8s_deb(
 k8s_deb(
     name = "kubelet",
     depends = [
-        "iptables (>= 1.4.21)",
+        "conntrack",
-        "kubernetes-cni (>= 0.5.1)",
-        "iproute2",
-        "socat",
-        "util-linux",
-        "mount",
         "ebtables",
         "ethtool",
+        "iproute2",
+        "iptables (>= 1.4.21)",
+        "kubernetes-cni (>= 0.6.0)",
+        "mount",
+        "socat",
+        "util-linux",
     ],
     description = """Kubernetes Node Agent
 The node agent of Kubernetes, the container cluster manager
@@ -168,7 +169,7 @@ k8s_deb(
     depends = [
         "kubelet (>= 1.8.0)",
         "kubectl (>= 1.8.0)",
-        "kubernetes-cni (>= 0.5.1)",
+        "kubernetes-cni (>= 0.6.0)",
         "cri-tools (>= 1.11.0)",
     ],
     description = """Kubernetes Cluster Bootstrapping Tool

build/rpms/BUILD

@@ -47,6 +47,8 @@ pkg_rpm(
     changelog = "//:CHANGELOG.md",
     data = [
         "10-kubeadm.conf",
+        "50-kubeadm.conf",
+        "kubeadm.conf",
         "kubelet.env",
         "//cmd/kubeadm",
     ],

build/rpms/cri-tools.spec

@@ -11,7 +11,7 @@ Binaries to interface with the container runtime.
 
 %prep
 # This has to be hard coded because bazel does a path substitution before rpm's %{version} is substituted.
-tar -xzf {crictl-v1.12.0-linux-amd64.tar.gz}
+tar -xzf {cri_tools.tgz}
 
 %install
 install -m 755 -d %{buildroot}%{_bindir}

build/rpms/kubeadm.spec

@@ -5,7 +5,7 @@ License: ASL 2.0
 Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool
 Requires: kubelet >= 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
 
 URL: https://kubernetes.io
@@ -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 {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
 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}%{_sysctldir} %{50-kubeadm.conf}
+install -p -m 0644 -t %{buildroot}/usr/lib/sysctl.d/ {50-kubeadm.conf}
 
 %files
 %{_bindir}/kubeadm
@@ -32,4 +32,4 @@ install -p -m 0644 -t %{buildroot}%{_sysctldir} %{50-kubeadm.conf}
 %{_sysconfdir}/sysconfig/kubelet
 %dir %{_libexecdir}/modules-load.d
 %{_libexecdir}/modules-load.d/kubeadm.conf
-%{_sysctldir}/50-kubeadm.conf
+/usr/lib/sysctl.d/50-kubeadm.conf

build/rpms/kubelet.spec

@@ -6,13 +6,14 @@ Summary: Container Cluster Manager - Kubernetes Node Agent
 
 URL: https://kubernetes.io
 
-Requires: iptables >= 1.4.21
+Requires: conntrack
-Requires: kubernetes-cni >= 0.5.1
+Requires: ebtables
-Requires: socat
-Requires: util-linux
 Requires: ethtool
 Requires: iproute
-Requires: ebtables
+Requires: iptables >= 1.4.21
+Requires: kubernetes-cni >= 0.6.0
+Requires: socat
+Requires: util-linux
 
 %description
 The node agent of Kubernetes, the container cluster manager.

build/rpms/kubernetes-cni.spec

@@ -3,7 +3,6 @@ Version: OVERRIDE_THIS
 Release: 00
 License: ASL 2.0
 Summary: Container Cluster Manager - CNI plugins
-
 URL: https://kubernetes.io
 
 %description
@@ -11,7 +10,7 @@ Binaries required to provision container networking.
 
 %prep
 mkdir -p ./bin
-tar -C ./bin -xz -f {cni-plugins-amd64-v0.6.0.tgz}
+tar -C ./bin -xz -f {kubernetes_cni.tgz}
 
 %install