kubepkg: Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages

Signed-off-by: Stephen Augustus <[email protected]>

Author: justaugustus

cmd/kubepkg/templates/latest/deb/kubelet/debian/control

@@ -10,6 +10,9 @@ Vcs-Browser: https://github.com/kubernetes/kubernetes
 
 Package: kubelet
 Architecture: {{ .BuildArch }}
-Depends: iptables (>= 1.4.21), kubernetes-cni (>= {{ index .Dependencies "kubernetes-cni" }}), iproute2, socat, util-linux, mount, ebtables, ethtool, conntrack, ${misc:Depends}
+Depends: iptables (>= 1.4.21), iproute2, socat, util-linux, mount, ebtables, ethtool, conntrack, ${misc:Depends}
+Provides: kubernetes-cni
+Conflicts: kubernetes-cni
+Replaces: kubernetes-cni
 Description: Kubernetes Node Agent
  The node agent of Kubernetes, the container cluster manager

cmd/kubepkg/templates/latest/deb/kubelet/debian/kubelet.install

@@ -1,2 +1,3 @@
 usr/bin/kubelet usr/bin/
 lib/systemd/system/kubelet.service lib/systemd/system/
+bin/ opt/cni

cmd/kubepkg/templates/latest/deb/kubelet/debian/rules

@@ -17,6 +17,10 @@ else
 		"{{ .DownloadLinkBase }}/bin/linux/{{ .GoArch }}/kubelet"
 endif
 	chmod +x usr/bin/kubelet
+	mkdir -p ./bin
+	curl -sSL --fail --retry 5 \
+		"https://storage.googleapis.com/k8s-artifacts-cni/release/v{{ .CNIVersion }}/cni-plugins-linux-{{ .GoArch }}-v{{ .CNIVersion }}.tgz" \
+		| tar -C ./bin -xz
 	dh_testroot
 	dh_auto_install
 	dh_shlibdeps